diff --git a/src/colab/deprecated/templates/base.html b/src/colab/deprecated/templates/base.html index 81cb6f1..6b8c742 100644 --- a/src/colab/deprecated/templates/base.html +++ b/src/colab/deprecated/templates/base.html @@ -1,5 +1,5 @@ -{% load i18n browserid conversejs %} +{% load i18n browserid conversejs gravatar %} @@ -43,66 +43,79 @@ {% browserid_info %}
- {% if not user.is_authenticated %} -
- {% trans "Register" %} -
-
- {% browserid_login text='Login' next=request.path %} -
- {% else %} -
- {% trans "authenticated as" %} {{ user.username }} -
-
- - {% trans "My Profile" %} - -
-
- {% browserid_logout text='Logout '%} -
- {% endif %}
- {% block header %} - - - {% trans 'Colab' %} - - {% endblock %} + {% block header %}{% endblock %} + +
{% block main-content %} {% endblock %} diff --git a/src/colab/static/css/screen.css b/src/colab/static/css/screen.css index 7d18624..4bb91cb 100644 --- a/src/colab/static/css/screen.css +++ b/src/colab/static/css/screen.css @@ -1,21 +1,51 @@ body { - font-size: 15px; + padding-top: 70px; } /* Header */ -#header-searchbox { - width: 280px; -} -#header-menu { - line-height: 50px; + +#header-searchbox { + width: 200px; } #header-hr { margin-top: 0; } + +.navbar-default .navbar-brand, +.navbar a.dropdown-toggle { + padding: 0; + margin-top: 5px; + margin-left: 10px; +} + +.navbar .user-menu { + padding: 10px; + white-space: nowrap; +} + +.navbar .user-menu a { + margin: 5px 0; +} + +.navbar .user-menu-info { + display: inline-block; + vertical-align: top; + padding-left: 5px; +} + +.navbar .user-menu-info span { + display: block; +} + +.navbar .dropdown-menu .thumbnail { + width: 100px; + display: inline-block; +} + /* End of Header */ @@ -28,7 +58,7 @@ body { .preview-message { white-space: nowrap; overflow: hidden; - line-height: 28px; + line-height: 25px; border-bottom: solid 1px #ddd; } @@ -138,7 +168,7 @@ ul.unstyled-list { } ul.unstyled-list li { - min-height: 30px; + min-height: 27px; } ul.unstyled-list .glyphicon-chevron-right { -- libgit2 0.21.2