diff --git a/app/medwings/templates/medwings/base.html b/app/medwings/templates/medwings/base.html index ed9a18c..a9b7547 100644 --- a/app/medwings/templates/medwings/base.html +++ b/app/medwings/templates/medwings/base.html @@ -1,19 +1,27 @@ {% load static %} - - - + + + - {% block title %}Medwings{% endblock title %} - - + {% block title %}Medwings{% endblock title %} + + - - - - {% block content %} - {% endblock content %} - - + + + +
+ {% include 'medwings/navbar.html' %} +
+
+ {% block content %} + {% endblock content %} +
+ + + diff --git a/app/medwings/templates/medwings/footer.html b/app/medwings/templates/medwings/footer.html new file mode 100644 index 0000000..b13ea7a --- /dev/null +++ b/app/medwings/templates/medwings/footer.html @@ -0,0 +1,3 @@ +
+

Footer stuff.

+
diff --git a/app/medwings/templates/medwings/index.html b/app/medwings/templates/medwings/index.html index 3a2a184..9ed839f 100644 --- a/app/medwings/templates/medwings/index.html +++ b/app/medwings/templates/medwings/index.html @@ -7,5 +7,5 @@ {% block content %}

Welcome to Medwings

There ain't much 'ere yet... - A withings thermometer. + {% comment %}A withings thermometer.{% endcomment %} {% endblock content %} diff --git a/app/medwings/templates/medwings/navbar.html b/app/medwings/templates/medwings/navbar.html new file mode 100644 index 0000000..d46340d --- /dev/null +++ b/app/medwings/templates/medwings/navbar.html @@ -0,0 +1,47 @@ + diff --git a/assets/css/styles.css b/assets/css/styles.css index 7884ce5..2ea1de7 100644 --- a/assets/css/styles.css +++ b/assets/css/styles.css @@ -10,25 +10,40 @@ h1, h2, h3, h4, h5, h6 { } h1 { - font-size: 3rem; + font-size: 3rem; } h2 { - font-size: 2.6rem; + font-size: 2.6rem; } h3 { - font-size: 2.2rem; + font-size: 2.2rem; } h4 { - font-size: 1.8rem; + font-size: 1.8rem; } h5 { - font-size: 1.4rem; + font-size: 1.4rem; } h6 { - font-size: 1rem; + font-size: 1rem; +} + +body.global { + min-height: 100vh; + width: 100%; + display: flex; + flex-direction: column; +} + +header.global, main.global, footer.global { + width: 100%; +} + +main.global { + flex-grow: 1; }