diff options
| -rw-r--r-- | hyperkitty/static/css/hyperkitty.css | 26 | ||||
| -rw-r--r-- | hyperkitty/templates/base.html | 6 | ||||
| -rw-r--r-- | hyperkitty/templates/month_view.html | 17 | ||||
| -rw-r--r-- | hyperkitty/templates/user_profile.html | 2 |
4 files changed, 23 insertions, 28 deletions
diff --git a/hyperkitty/static/css/hyperkitty.css b/hyperkitty/static/css/hyperkitty.css index 4494736..0ce2c98 100644 --- a/hyperkitty/static/css/hyperkitty.css +++ b/hyperkitty/static/css/hyperkitty.css @@ -108,6 +108,7 @@ ul.lists li a:hover { /* User profile page */ table.user-data { + margin-top: 2em; width: auto; } @@ -225,10 +226,6 @@ form.likeform { margin-left: 20px; } -.nav .root { - font-weight: bold; -} - #top_right { position: absolute; @@ -364,27 +361,22 @@ form.likeform { margin-bottom: 4em; } -#month-view .month-header .list-name { - display: inline; - font-size: 190%; - font-weight: bold; - padding-right: 0.5em; -} - -#month-view .month-header .month-name { - display: inline; - font-size: 190%; - padding-right: 1em; -} - #month-view .month-header .month-info { display: inline; list-style-type: none; + margin: 0; + padding: 0; } #month-view .month-header .month-info li { display: inline; + margin-right: 2em; +} +#month-view .month-header .month-info li.list-address { + font-size: 120%; + margin-right: 4em; } + /* Thread list */ .thread { diff --git a/hyperkitty/templates/base.html b/hyperkitty/templates/base.html index 62d4c4f..f93d007 100644 --- a/hyperkitty/templates/base.html +++ b/hyperkitty/templates/base.html @@ -32,10 +32,12 @@ </ul> + <a class="brand" href="{% url root %}">{{ app_name|title }}</a> + <ul class="nav"> - <li class="root{% if not list_address %} active{% endif %}"> - <a href="{% url root %}">{{ app_name|title }}</a> + <li {% if not list_address %} class="active"{% endif %}> + <a href="{% url root %}">All lists</a> </li> {% if list_address %} diff --git a/hyperkitty/templates/month_view.html b/hyperkitty/templates/month_view.html index 243c8b1..526eb15 100644 --- a/hyperkitty/templates/month_view.html +++ b/hyperkitty/templates/month_view.html @@ -16,10 +16,16 @@ <div id="month-view" class="span8"> - <div class="month-header"> - <div class="list-name">{{ mlist.display_name|default:mlist.name|escapeemail }}</div> - <div class="month-name">{{ month|date:"F Y"|capfirst }}</div> + <div class="month-header page-header"> + <h1>{{ mlist.display_name|default:mlist.name|escapeemail }} + <small>{{ month|date:"F Y"|capfirst }}</small> + </h1> <ul class="month-info"> + {% if mlist.display_name %} + <li class="list-address"> + {{ list_address|escapeemail }} + </li> + {% endif %} <li class="participant"> {{ month_participants }} participants </li> @@ -27,11 +33,6 @@ {{ month_discussions }} discussions </li> </ul> - {% if mlist.display_name %} - <p class="list-address"> - {{ list_address|escapeemail }} - </p> - {% endif %} </div> {% for thread in threads %} diff --git a/hyperkitty/templates/user_profile.html b/hyperkitty/templates/user_profile.html index 491d75e..c967be6 100644 --- a/hyperkitty/templates/user_profile.html +++ b/hyperkitty/templates/user_profile.html @@ -8,7 +8,7 @@ {% endblock %} {% block content %} - <h1>User Profile <span>- {{ user }}</span></h1> + <h1>{{ user }}</h1> <table class="table table-bordered table-striped user-data"> <tbody> |