From b914225af239041c77bc4557a12e259a78d6025a Mon Sep 17 00:00:00 2001 From: Marian Sigler Date: Wed, 26 Sep 2012 06:13:26 +0200 Subject: add accounts logo, style header --- contrib/logo.svg | 109 +++++++++++++++++++++++++++++++++++++++ static/layout.css | 134 ++++++++++++++++++++++++++++++++++++++++++++---- static/logo.png | Bin 8447 -> 12021 bytes templates/base.html | 58 ++++++++++++++------- templates/index.html | 1 - templates/settings.html | 6 +-- 6 files changed, 274 insertions(+), 34 deletions(-) create mode 100644 contrib/logo.svg diff --git a/contrib/logo.svg b/contrib/logo.svg new file mode 100644 index 0000000..60389f0 --- /dev/null +++ b/contrib/logo.svg @@ -0,0 +1,109 @@ + + + + spline + + + + + + + + spline + spline.de + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/static/layout.css b/static/layout.css index bf7a28d..a5552ed 100644 --- a/static/layout.css +++ b/static/layout.css @@ -1,3 +1,122 @@ + +/* COMMON STYLE SETTINGS */ + +:link, :visited { + text-decoration: none; +} +:link:hover, :visited:hover { + text-decoration: underline; +} + + +/* COMMON PAGE ELEMENTS */ + +html, body { + margin: 0; + padding: 0; + background-color: white; +} + +/* header */ + +#header-background { + background-color: #333; + width: 100%; + height: 4em; + margin-bottom: 4em; +} +header { + position: absolute; + top: 0; + margin: 0; + padding: 1em 0; + width: 100%; +} +header h1 { + margin: 0; + padding: 0 1em 0; + display: inline-block; + background-color: #333; + border-bottom-right-radius: 30px; +} +header h1 img { + margin: 0; +} +header #roundcornerb, +header #roundcornerw { + display: inline-block; + width: 50px; + height: 50px; + position: absolute; + top: 4em; +} +header #roundcornerb { + background-color: #333; +} +header #roundcornerw { + background-color: white; + border-top-left-radius: 30px; +} + +header nav#mainnav { + position: absolute; + top: .5em; + right: 1em; +} +header nav#mainnav, +header nav#mainnav :link, +header nav#mainnav :visited { + color: #eee; +} +header nav#usermenu :link, +header nav#usermenu :visited { + color: black; +} + +header nav#usermenu { + position: absolute; + top: 4em; + 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; +} + + +/* content */ + +#content { + margin: 0 auto; + max-width: 50em; +} + +#content h1 { + font-size: 1.8em; +} +#content h2 { + font-size: 1.4em; +} +#content h3 { + font-size: 1.2em; +} + + + + +/* SPECIAL PAGE ELEMENTS */ + +/* form stuff */ form .errors { color: #D00; margin: .2em 0 .5em; @@ -6,6 +125,8 @@ form ul.errors { padding-left: 1em; } +/* flashing */ + ul.flashes { padding-left: 0; } @@ -13,9 +134,10 @@ ul.flashes li { list-style: none; margin: .2em 0; display: block; - padding: .2em .4em; + padding: .2em .6em; border: 1px solid #ee3; + border-radius: 3px; background-color: #ffd; } ul.flashes li.error { @@ -27,13 +149,3 @@ ul.flashes li.success { background-color: #dfd; } - -body { - margin: 0 auto; - max-width: 40em; -} - -#header { - margin: 0 auto; - text-align: center; -} diff --git a/static/logo.png b/static/logo.png index 2ddbb50..ea415a8 100644 Binary files a/static/logo.png and b/static/logo.png differ diff --git a/templates/base.html b/templates/base.html index 425ea34..381fd0f 100644 --- a/templates/base.html +++ b/templates/base.html @@ -3,6 +3,7 @@ + {% if title %}{{ title }} – {% endif %}spline accounts {%- for script in scripts %} @@ -13,30 +14,49 @@ -

Spline

+
 
+
+

spline accounts

+   +   - {%- if not no_login_message %} - {%- if g.user %} -

Angemeldet als {{ g.user.uid }} | Abmelden

- {%- else %} -

Nicht angemeldet | Login

- {%- endif %} - {%- endif %} + + + {%- if not no_login_message %} + + {%- endif %} +
- {% with messages = get_flashed_messages(with_categories=true) %} +
+ {% with messages = get_flashed_messages(with_categories=true) %} {% if messages %} - {% endif %} - {% endwith %} - - {% if title %} -

{{ title }}

- {% endif %} + {% endwith %} - {% block content %}{% endblock %} + {% if title %} +

{{ title }}

+ {% endif %} + {% block content %}{% endblock %} +
diff --git a/templates/index.html b/templates/index.html index cbbaa44..ea5e258 100644 --- a/templates/index.html +++ b/templates/index.html @@ -1,7 +1,6 @@ {%- extends 'base.html' %} {%- from '_macros.html' import render_field %} {%- block content %} -

Willkommen bei spline accounts!

{%- if session.username %}

Hallo {{ session.username }}. Einstellungen

{%- else %} diff --git a/templates/settings.html b/templates/settings.html index c672493..de317fb 100644 --- a/templates/settings.html +++ b/templates/settings.html @@ -4,16 +4,16 @@ {%- block content %}
{{ render_field(form.old_password, autofocus="autofocus") }} -

Globale Einstellungen ändern

+

Globale Einstellungen ändern

{{ render_field(form.mail) }} {{ render_field(form.password) }} {{ render_field(form.password_confirm) }} {{ form.csrf_token }}
-

Dienste verwalten

+

Dienste verwalten

{%- for service in services %} -

{{ service.name }}

+

{{ service.name }}

{%- if service.changed %}

Eigenes Passwort gesetzt

löschen, todo

-- cgit v1.2.3-1-g7c22