diff --git a/app.py b/app.py index 3e470fd..64f5a3d 100644 --- a/app.py +++ b/app.py @@ -8,13 +8,12 @@ import flask from json import dumps from flask import Flask, make_response, render_template, request from bitshift import assets -from bitshift.database import Database + from bitshift.database import Database from bitshift.languages import LANGS from bitshift.query import parse_query, QueryParseException app = Flask(__name__, static_folder="static", static_url_path="") app.config.from_object("bitshift.config") -app.jinja_env.globals.update(year=datetime.datetime.now().year) app_env = app.jinja_env app_env.line_statement_prefix = "=" diff --git a/static/sass/main.sass b/static/sass/main.sass index e987f0c..71b3a9e 100644 --- a/static/sass/main.sass +++ b/static/sass/main.sass @@ -29,12 +29,9 @@ div#container width: 75% div#footer - @extend .t3 - @include delay(1s) - background-color: $baseColor1 - bottom: -30px - height: 60px + bottom: 0 + height: 30px padding-bottom: 5px padding-top: 15px position: fixed @@ -42,11 +39,6 @@ div#container width: 100% z-index: 100 - &:hover - @include delay(0s) - - bottom: 0 - * color: white @@ -60,6 +52,3 @@ div#container &:hover text-decoration: underline - - p span - font-size: 0.7em diff --git a/templates/error404.html b/templates/error404.html index 0e258b3..8c71ae0 100644 --- a/templates/error404.html +++ b/templates/error404.html @@ -1,5 +1,9 @@ = extends "layout.html" += block title + 404 += endblock + = block head {{ assets.tag("error404.css") }} = endblock @@ -7,16 +11,16 @@ = block body
{{ assets.syntax_highlight([ - 'puts("404");', - 'printf("%d\n", 404);', - 'puts 404', - 'System.out.println("404")', - 'print 404', - 'console.log("404")', - 'echo 404', - 'std::cout << "404\\n"', - '(println "404")', - 'say "404!";' - ] | random) | safe }} + 'puts("404");', + 'printf("%d\n", 404);', + 'puts 404', + 'System.out.println("404")', + 'print 404', + 'console.log("404")', + 'echo 404', + 'std::cout << "404\\n"', + '(println "404")', + 'say "404!";' + ] | random) | safe }}
= endblock diff --git a/templates/index.html b/templates/index.html index c64ac94..87390a2 100644 --- a/templates/index.html +++ b/templates/index.html @@ -88,10 +88,10 @@
-
language
- - - Regex +
languages
Regex
diff --git a/templates/layout.html b/templates/layout.html index ebdcdba..6c6ab8d 100644 --- a/templates/layout.html +++ b/templates/layout.html @@ -41,9 +41,6 @@ home about developers -

- © {{ year }} bitshift -