Browse Source

Rem footer animations; fix language mis-alignment.

Add:
        app.py, templates/layout.html, static/sass/main.sass
                -Remove footer's slide-up animation; the additional content
                displayed (a copyright statement) is superfluous.
tags/v1.0^2
Severyn Kozak 10 years ago
parent
commit
81126ab3e8
5 changed files with 22 additions and 33 deletions
  1. +1
    -2
      app.py
  2. +2
    -13
      static/sass/main.sass
  3. +15
    -11
      templates/error404.html
  4. +4
    -4
      templates/index.html
  5. +0
    -3
      templates/layout.html

+ 1
- 2
app.py View File

@@ -8,13 +8,12 @@ import flask
from json import dumps from json import dumps
from flask import Flask, make_response, render_template, request from flask import Flask, make_response, render_template, request
from bitshift import assets from bitshift import assets
from bitshift.database import Database
from bitshift.database import Database
from bitshift.languages import LANGS from bitshift.languages import LANGS
from bitshift.query import parse_query, QueryParseException from bitshift.query import parse_query, QueryParseException


app = Flask(__name__, static_folder="static", static_url_path="") app = Flask(__name__, static_folder="static", static_url_path="")
app.config.from_object("bitshift.config") app.config.from_object("bitshift.config")
app.jinja_env.globals.update(year=datetime.datetime.now().year)


app_env = app.jinja_env app_env = app.jinja_env
app_env.line_statement_prefix = "=" app_env.line_statement_prefix = "="


+ 2
- 13
static/sass/main.sass View File

@@ -29,12 +29,9 @@ div#container
width: 75% width: 75%


div#footer div#footer
@extend .t3
@include delay(1s)

background-color: $baseColor1 background-color: $baseColor1
bottom: -30px
height: 60px
bottom: 0
height: 30px
padding-bottom: 5px padding-bottom: 5px
padding-top: 15px padding-top: 15px
position: fixed position: fixed
@@ -42,11 +39,6 @@ div#container
width: 100% width: 100%
z-index: 100 z-index: 100


&:hover
@include delay(0s)

bottom: 0

* *
color: white color: white


@@ -60,6 +52,3 @@ div#container


&:hover &:hover
text-decoration: underline text-decoration: underline

p span
font-size: 0.7em

+ 15
- 11
templates/error404.html View File

@@ -1,5 +1,9 @@
= extends "layout.html" = extends "layout.html"


= block title
404
= endblock

= block head = block head
{{ assets.tag("error404.css") }} {{ assets.tag("error404.css") }}
= endblock = endblock
@@ -7,16 +11,16 @@
= block body = block body
<div id="message"> <div id="message">
{{ assets.syntax_highlight([ {{ 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 }}
</div> </div>
= endblock = endblock

+ 4
- 4
templates/index.html View File

@@ -88,10 +88,10 @@
<div id="search-groups"> <div id="search-groups">
<div class="search-group" id="selected"> <div class="search-group" id="selected">
<div id="language"> <div id="language">
<div class="name">language</div>
<input id="autocomplete" class="language" name="language" type="text">
<input type="checkbox" name="regex">
<span class="regex">Regex</span>
<div class="name">languages</div
><input id="autocomplete" class="language" name="language" type="text"
><input type="checkbox" name="regex"
><span class="regex">Regex</span>
</div> </div>
</div> </div>
</div> </div>


+ 0
- 3
templates/layout.html View File

@@ -41,9 +41,6 @@
<a href="/">home</a> <a href="/">home</a>
<a href="/about">about</a> <a href="/about">about</a>
<a href="/developers">developers</a> <a href="/developers">developers</a>
<p>
&copy; {{ year }} bitshift
</p>
</div> </div>
</div> </div>
</body> </body>


Loading…
Cancel
Save