From 65b2a60e9450a84ceb833ce8b1fa4ae60ca66682 Mon Sep 17 00:00:00 2001 From: Matheus Figueiredo Date: Thu, 8 Aug 2013 18:02:42 -0300 Subject: [PATCH] Fixing some Grid and adding message-preview css --- src/colab/deprecated/templates/base.html | 50 ++++++++++++++++++++++++-------------------------- src/colab/deprecated/templates/home.html | 22 +++++++++------------- src/colab/static/css/screen.css | 80 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 113 insertions(+), 39 deletions(-) diff --git a/src/colab/deprecated/templates/base.html b/src/colab/deprecated/templates/base.html index 8f9f1c1..e0f0c0a 100644 --- a/src/colab/deprecated/templates/base.html +++ b/src/colab/deprecated/templates/base.html @@ -40,30 +40,28 @@
-
- {% if not user.is_authenticated %} - - {% trans "Sign up" %} - - - {% trans "Login" %} - - {% else %} - - {% trans "authenticated as" %} {{ user.username }} - - - - {% trans "My Profile" %} - - - - - {% trans "Logout" %} - - - {% endif %} + {% if not user.is_authenticated %} +
+ {% trans "Sign up" %} +
+
+ {% trans "Login" %} +
+ {% else %} +
+ {% trans "authenticated as" %} {{ user.username }}
+
+ + {% trans "My Profile" %} + +
+
+ + {% trans "Logout" %} + +
+ {% endif %}
{% block header %} @@ -73,7 +71,7 @@ {% endblock %} -
+
{% trans "Discussions" %} @@ -95,14 +93,14 @@
-
-
+
{% block main-content %} {% endblock %} diff --git a/src/colab/deprecated/templates/home.html b/src/colab/deprecated/templates/home.html index e9a3e63..7f0c58f 100644 --- a/src/colab/deprecated/templates/home.html +++ b/src/colab/deprecated/templates/home.html @@ -20,8 +20,8 @@

- {% trans "Latest collaborations" %} - {% trans "Latest collaborations" %} + {% trans 'RSS' %} @@ -31,8 +31,7 @@ {% include "message-preview.html" %} {% endfor %} -
- {% trans "View more collaborations..." %} @@ -49,8 +48,8 @@

- {% trans "Discussions Most Relevance" %} - {% trans "Discussions Most Relevance" %} + {% trans 'RSS' %} @@ -60,8 +59,7 @@ {% include "message-preview.html" with doc=thread.latest_message %} {% endfor %} -
- {% trans "View more discussions relevance..." %} @@ -69,8 +67,8 @@

- {% trans "Latest Discussions" %} - {% trans "Latest Discussions" %} + {% trans 'RSS' %} @@ -80,9 +78,7 @@ {% include "message-preview.html" with doc=thread.latest_message %} {% endfor %} -
- + {% trans "View more discussions..." %}

diff --git a/src/colab/static/css/screen.css b/src/colab/static/css/screen.css index e69de29..9ab6fa8 100644 --- a/src/colab/static/css/screen.css +++ b/src/colab/static/css/screen.css @@ -0,0 +1,80 @@ +/* Header */ + +#header-searchbox { + width: 290px; +} + +#header-menu { + line-height: 33px; +} + +#header-hr{ + margin-top: 0; +} + +/* From message-preview.html*/ +.quiet { + color: #999; + font-size: 95%; +} + +.preview-message { + white-space: nowrap; + overflow: hidden; + line-height: 28px; + border-bottom: solid 1px #ddd; +} + +.preview-message a { + text-decoration: none; +} + +.preview-message img { + margin-right: 5px; +} + +.tag { + text-decoration: none; + background-color: #2183b3; + padding: 2px 4px; + border-radius: 5px; + font-size: 90%; + color: #fff; + margin-right: 5px; + line-height: 2; + white-space: nowrap; +} + +.tag:hover, +.tag:focus { + background-color: #21b6e6; + color: #fff; +} + +.tag-cloud .size-1 { + font-size: 90%; +} +.tag-cloud .size-2 { + font-size: 100%; +} +.tag-cloud .size-3 { + font-size: 130%; +} +.tag-cloud .size-4 { + font-size: 150%; +} + +.subject, +.subject a { + color: #000; +} + +.subject a:hover, +.subject a:focus { + text-decoration: underline; + color: #335; +} + +.subject img { + margin-right: 5px; +} -- libgit2 0.21.2