diff --git a/smash/static/css/custom.css b/smash/static/css/custom.css index 1eb3802..0d5b38b 100644 --- a/smash/static/css/custom.css +++ b/smash/static/css/custom.css @@ -7,7 +7,7 @@ html, body { } .content { - min-height: 80vh; + min-height: 100%; position: relative; } @@ -48,9 +48,11 @@ html, body { background-color: #212121; box-shadow: 0 -2px 10px 0px rgba(33, 33, 33, 0.85); position: absolute; + padding: 0; + margin-top: 50px; right: 0; - bottom: 0; left: 0; + bottom: 0; } .footer-copyright { @@ -76,3 +78,18 @@ html, body { .rate-negative { color: #f44336; } + +.table-separator{ + background-color: #03A9F4; + padding: 0!important; + width: 3px; + height: 100%; +} + +.table{ + height: 100%; +} + +.table > tbody > tr > td{ + border-top: 0; +} diff --git a/smash/templates/base.html b/smash/templates/base.html index 3de0eeb..0357e6f 100644 --- a/smash/templates/base.html +++ b/smash/templates/base.html @@ -15,7 +15,7 @@ -
+
diff --git a/smash/templates/index.html b/smash/templates/index.html index a1b4107..bd5c8a9 100644 --- a/smash/templates/index.html +++ b/smash/templates/index.html @@ -1,4 +1,20 @@ {% extends "base.html" %} {% block content %} -{{ msg }} + + + + + + + + + +
+ {{ welcometext|safe }} + + + {{ newstext|safe }} +
+ +{{ msg|safe }} {% endblock %} diff --git a/smash/views.py b/smash/views.py index 978a38e..54c96da 100644 --- a/smash/views.py +++ b/smash/views.py @@ -1,3 +1,4 @@ +import datetime from flask import render_template from smash import app, conf, db @@ -5,12 +6,21 @@ from smash import app, conf, db @app.route('/') def index(): + + welcome = "

Welcome to the quote archive.

" + news = ("

02/12/2016{}

{} running on smash quote database" + " engine launched today

").format( + datetime.datetime.now().strftime("%d/%m/%y"), + conf.config['APPNAME'] + ) + return render_template( "index.html", appname=conf.config['APPNAME'], appbrand=conf.config['APPBRAND'], title="Quotes", - msg="Landing page!" + welcometext=welcome, + newstext=news )