diff --git a/snikket_web/scss/_theme.scss b/snikket_web/scss/_theme.scss index f3a9028..05db852 100644 --- a/snikket_web/scss/_theme.scss +++ b/snikket_web/scss/_theme.scss @@ -252,3 +252,4 @@ $h-sizes: [200.0%, 174.11011266%, 151.57165665%, 131.95079108%, 114.8698355%, 10 $h-small-sizes: [150.0%, 138.31618672%, 127.54245006%, 117.60790225%, 108.44717712%, 100.0%]; $small-screen-threshold: 40rem; $medium-screen-threshold: 60rem; +$large-screen-threshold: 80rem; diff --git a/snikket_web/scss/app.scss b/snikket_web/scss/app.scss index e11473e..063d25c 100644 --- a/snikket_web/scss/app.scss +++ b/snikket_web/scss/app.scss @@ -33,13 +33,35 @@ body { main { padding: $w-l1; - margin-left: auto; - max-width: 60rem; - margin-right: auto; } #mwrap { flex: 1; + display: flex; + flex-direction: row-reverse; + + > .filler, > .flashbox { + flex: 1 1 1rem; + } + + > main { + flex: 0 1 60rem; + } +} + +@media screen and (max-width: $large-screen-threshold) { + #mwrap { + display: block; + + > main { + margin-left: auto; + margin-right: auto; + } + } +} + +.flashbox > div.box > :first-child { + margin-top: 0; } /* top bar */ diff --git a/snikket_web/templates/login.html b/snikket_web/templates/login.html index 11ed078..515d0c4 100644 --- a/snikket_web/templates/login.html +++ b/snikket_web/templates/login.html @@ -9,7 +9,7 @@ {{ super() }} {% endblock %} {% block body %} -
+

{{ config["SITE_NAME"] }}

{{ _("Enter your Snikket address and password to manage your account.") }}

@@ -51,6 +51,6 @@ var domainCheck = function() { return true; }; -
+
{%- include "_footer.html" -%} {% endblock %} diff --git a/snikket_web/templates/unauth.html b/snikket_web/templates/unauth.html index f11159d..897035c 100644 --- a/snikket_web/templates/unauth.html +++ b/snikket_web/templates/unauth.html @@ -7,6 +7,25 @@
{% block topbar_right %}{% endblock %} -
{% block content %}{% endblock %}
+
+ {#- -#} +
+ {%- for category, message in get_flashed_messages(True) -%} + + {%- endfor -%} +
+ {#- -#} +
{% block content %}{% endblock %}
+ {#- -#} +
+ {#- -#} +
{%- include "_footer.html" -%} {% endblock %}