diff --git a/static/css/style.css b/static/css/style.css index dc9f710..a6359ad 100644 --- a/static/css/style.css +++ b/static/css/style.css @@ -1,93 +1,14 @@ -html { - box-sizing: border-box; +body { + padding-top: 20px; + padding-bottom: 20px; } -*, ::before, ::after { - box-sizing: inherit; +.navbar { + margin-bottom: 20px; } -body{ - margin: 10px auto; - max-width: 60em; - font-family: sans-serif; - color: #111111; -} - -header, nav, nav a, main, article, section, aside, footer { - border: 1px solid; - padding: 10px; - margin: 10px; -} - -header { - background: #F7F7F7; - border-color: #DDDDDD; -} - -header img { - width: 13em; - height: 5em; - margin-right: 50px; - float: left; -} - -nav { - font-size: 0.91em; - float: left; - width: 15em; - padding: 0; - margin-top: 0; - background: #E6E6E6; - border-color: #CCCCCC; -} - -nav ul { - padding:0; -} - -nav li { - list-style: none; - margin: 0; - padding: 0.5em; -} - -nav a { - display: block; - padding: 0.2em 10px; - font-weight: bold; - text-decoration: none; - background-color: #e7c157; - color: #333; -} - -nav ul a:hover, -nav ul a:active { - color: #fffbf0; - background-color: #dfac20;; -} - -main { - background: #D5D5D5; - border-color: #BBBBBB; - margin-left: 15em; - min-width: 16em; -} - -section { - background: #F1F3F4; - border-color: slateblue; -} - -footer { - background: #C4C4C4; - border-color: #AAAAAA; - clear: both; -} - -footer a, footer p { - margin: 0; -} - -* { - box-shadow: none!important; +.form-login { + max-width: 330px; + padding: 15px; + margin: 0 auto; } diff --git a/templates/_base.html b/templates/_base.html new file mode 100644 index 0000000..7ed9f50 --- /dev/null +++ b/templates/_base.html @@ -0,0 +1,35 @@ + + + + + + + + + Binary Kitchen: Directory Self-Service + + +
+ + {% block content %} + {% endblock %} + +
+ + diff --git a/templates/base.html b/templates/base.html deleted file mode 100644 index bb0b3a9..0000000 --- a/templates/base.html +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - Binary Kitchen: Directory Self-Service - - -
- Binary Kitchen -

Directory Self-Service

-
- -
- {% block content %} - {% endblock %} -
- - - diff --git a/templates/create.html b/templates/create.html index 624c74e..6696a5c 100644 --- a/templates/create.html +++ b/templates/create.html @@ -1,14 +1,17 @@ {% from "_helpers.html" import render_field %} -{% extends "base.html" %} +{% extends "_base.html" %} {% block content %} -
- {{ form.hidden_tag() }} - {{ render_field(form.user) }} - {{ render_field(form.uid) }} - {{ render_field(form.sn) }} - {{ render_field(form.gn) }} - {{ render_field(form.pwd1) }} - {{ render_field(form.pwd2) }} -
{{ form.submit(class_="btn btn-default") }}
-
+ +
+ {{ form.hidden_tag() }} + {{ render_field(form.user) }} + {{ render_field(form.uid) }} + {{ render_field(form.sn) }} + {{ render_field(form.gn) }} + {{ render_field(form.pwd1) }} + {{ render_field(form.pwd2) }} +
{{ form.submit(class_="btn btn-primary") }}
+
{% endblock %} diff --git a/templates/edit.html b/templates/edit.html index dae6a42..96b2c3b 100644 --- a/templates/edit.html +++ b/templates/edit.html @@ -1,11 +1,14 @@ {% from "_helpers.html" import render_field %} -{% extends "base.html" %} +{% extends "_base.html" %} {% block content %} -
- {{ form.hidden_tag() }} - {{ render_field(form.user) }} - {{ render_field(form.pwd1) }} - {{ render_field(form.pwd2) }} -
{{ form.submit(class_="btn btn-default") }}
-
+ +
+ {{ form.hidden_tag() }} + {{ render_field(form.user) }} + {{ render_field(form.pwd1) }} + {{ render_field(form.pwd2) }} +
{{ form.submit(class_="btn btn-primary") }}
+
{% endblock %} diff --git a/templates/error.html b/templates/error.html index c15f81c..7d685e7 100644 --- a/templates/error.html +++ b/templates/error.html @@ -1,4 +1,6 @@ -{% extends "base.html" %} +{% extends "_base.html" %} {% block content %} -

Error: {{ message }}

+ {% endblock %} diff --git a/templates/index.html b/templates/index.html index 951f86b..12b090f 100644 --- a/templates/index.html +++ b/templates/index.html @@ -1,4 +1,4 @@ -{% extends "base.html" %} +{% extends "_base.html" %} {% block content %} -

Hello, World!

+

Hello, World!

{% endblock %} diff --git a/templates/login.html b/templates/login.html index 45f86e1..8a52e08 100644 --- a/templates/login.html +++ b/templates/login.html @@ -1,10 +1,10 @@ {% from "_helpers.html" import render_field %} -{% extends "base.html" %} +{% extends "_base.html" %} {% block content %} -
- {{ form.hidden_tag() }} - {{ render_field(form.user) }} - {{ render_field(form.pswd) }} -
{{ form.submit(class_="btn btn-default") }}
-
+
+ {{ form.hidden_tag() }} + {{ render_field(form.user) }} + {{ render_field(form.pswd) }} +
{{ form.submit(class_="btn btn-primary") }}
+
{% endblock %}