diff options
| -rw-r--r-- | static/layout.css | 28 | ||||
| -rw-r--r-- | templates/index.html | 15 |
2 files changed, 26 insertions, 17 deletions
diff --git a/static/layout.css b/static/layout.css index a5552ed..7f78832 100644 --- a/static/layout.css +++ b/static/layout.css @@ -7,6 +7,16 @@ :link:hover, :visited:hover { text-decoration: underline; } +nav ul { + list-style: none; +} +nav ul li { + display: inline; +} +nav ul li:not(:last-child):after { + content: " · "; + color: #aaa; +} /* COMMON PAGE ELEMENTS */ @@ -33,14 +43,18 @@ header { width: 100%; } header h1 { + font-size: 2em; margin: 0; + max-width: 50%; /* make image smaller on small screens */ + min-height: 3em; padding: 0 1em 0; display: inline-block; background-color: #333; - border-bottom-right-radius: 30px; + border-bottom-right-radius: .8em; } header h1 img { margin: 0; + max-width: 100%; } header #roundcornerb, header #roundcornerw { @@ -55,7 +69,7 @@ header #roundcornerb { } header #roundcornerw { background-color: white; - border-top-left-radius: 30px; + border-top-left-radius: 1.6em; } header nav#mainnav { @@ -79,16 +93,6 @@ header nav#usermenu { right: 1em; } -header nav ul { - list-style: none; -} -header nav ul li { - display: inline; -} -header nav ul li:not(:last-child):after { - content: " · "; - color: #aaa; -} header nav#mainnav ul li:not(:last-child):after { color: #999; } diff --git a/templates/index.html b/templates/index.html index ea5e258..b3bd93c 100644 --- a/templates/index.html +++ b/templates/index.html @@ -1,18 +1,23 @@ {%- extends 'base.html' %} {%- from '_macros.html' import render_field %} {%- block content %} -{%- if session.username %} + +{%- if g.user %} <p>Hallo {{ session.username }}. <a href="{{ url_for('settings') }}">Einstellungen</a></p> {%- else %} -<p> - <a href="/register">Account erstellen</a> | - <a href="/lost_password">Passwort vergessen</a> -</p> <form action="{{ url_for('index') }}" method="post" class="form-horizontal"> + <h2>Login</h2> + <p> + Willkommen bei <strong>spline accounts</strong>. + Melde dich an, informier dich, oder leg einen account an. + </p> {{ render_field(form.username, autofocus="autofocus") }} {{ render_field(form.password) }} {{ form.csrf_token }} <div class="form-actions"><input type="submit" value="Login" /></div> + <p class="form-actions"><a href="/register">Account erstellen</a></div> + <p class="form-actions"><a href="/lost_password">Passwort vergessen</a></div> </form> {%- endif %} + {%- endblock %} |