diff --git a/fedireads/static/format.css b/fedireads/static/format.css index 951ef38e6..bd10ab34b 100644 --- a/fedireads/static/format.css +++ b/fedireads/static/format.css @@ -19,15 +19,25 @@ h2 { margin-bottom: 1rem; } -#main { +#main, header > div { margin: 0 auto; display: flex; flex-flow: row wrap; max-width: 75rem; + width: 100%; +} + +#branding, #actions { + margin: 0 1rem; +} +#branding { + flex-grow: 1; +} +#actions { + flex-grow: 0; } #top-bar { - height: 4rem; background-color: #B2DBBF; overflow: hidden; padding: 0.5rem; @@ -42,14 +52,6 @@ h2 { font-size: 2em; } -header > div:first-child { - float: left; -} - -header > div:last-child { - float: right; -} - #sidebar { display: flex; flex-direction: column; diff --git a/fedireads/templates/layout.html b/fedireads/templates/layout.html index cfb25d4a0..243b51550 100644 --- a/fedireads/templates/layout.html +++ b/fedireads/templates/layout.html @@ -21,27 +21,29 @@
-
-
- {% if user.is_authenticated %} -
- Welcome, {% if request.user.localname %}{{ request.user.localname }}{% else %}{{ request.user.username }}{% endif %} - -
- {% else %} -
- - - -
- {% endif %} -
-