Merge branch 'byron' into new-template

7 files changed, 254 insertions, 238 deletions

diff --git a/askbot/skins/default/media/images/tag-left.png b/askbot/skins/default/media/images/tag-left.png
index 5a9d8a0d..23369d98 100644
--- a/askbot/skins/default/media/images/tag-left.png
+++ b/askbot/skins/default/media/images/tag-left.png
diff --git a/askbot/skins/default/media/images/tag-right.png b/askbot/skins/default/media/images/tag-right.png
index 871664c3..05a62aba 100644
--- a/askbot/skins/default/media/images/tag-right.png
+++ b/askbot/skins/default/media/images/tag-right.png
diff --git a/askbot/skins/default/media/style/lib_style.less b/askbot/skins/default/media/style/lib_style.less
index a426a476..471f8333 100644
--- a/askbot/skins/default/media/style/lib_style.less
+++ b/askbot/skins/default/media/style/lib_style.less
@@ -19,7 +19,7 @@
 /* Receive exactly positions for background Sprite  */
 
 .sprites(@hor,@vert,@back:url(../images/sprites.png)){
-    background:@hor @vert @back;
+    background:@hor @vert @back no-repeat;
 }
 
 /* CSS3 Elements */
diff --git a/askbot/skins/default/media/style/style.css b/askbot/skins/default/media/style/style.css
index f494e672..db78c8ef 100644
--- a/askbot/skins/default/media/style/style.css
+++ b/askbot/skins/default/media/style/style.css
@@ -349,13 +349,14 @@ h1 {
     margin:6px 0px 0px 15px;
 
     .searchInput, .searchInputCancelable {
-        font-size: 18px;
+        font-size: 30px;
         height: 40px;
+        font-weight:300;
         background:#FFF;
         border:0px;
-        color:#c2c2c2;
+        color:#AEAD84;
         padding-left:10px;
-        font-family: 'Yanone Kaffeesatz', sans-serif;
+        font-family:@yanone;
     }
 
     .searchInput, .searchInputCancelable {
@@ -365,6 +366,9 @@ h1 {
     .searchInputCancelable {
         width: 317px;
     }
+    .logoutsearch {
+        width: 337px;
+    }
 
     .searchBtn {
         font-size: 10px;
@@ -517,10 +521,9 @@ h1 {
             border:0;
             color:@button-label;
             font-weight:bold;
-            font-size:26px;
+            font-size:12px;
             width:33px;
             height:27px;
-            font-family:@arial;
             margin-top:-2px;
             cursor:pointer;
             .rounded-corners(4px);
@@ -539,225 +542,12 @@ img.gravatar {
     margin:1px;
 }
 
-/* ----- Tags Styles ----- */
-
-/* tag formatting is also copy-pasted in template
-   because it must be the same in the emails
-   askbot/models/__init__.py:format_instant_notification_email()
-*/
-
-/* tag cloud */
-
-.tag-size-1 {
-    font-size:12px;
-}
-.tag-size-2 {
-    font-size:13px;
-}
-.tag-size-3 {
-    font-size:14px;
-}
-.tag-size-4 {
-    font-size:15px;
-}
-.tag-size-5 {
-    font-size:16px;
-}
-.tag-size-6 {
-    font-size:17px;
-}
-.tag-size-7 {
-    font-size:18px;
-}
-.tag-size-8 {
-    font-size:19px;
-}
-.tag-size-9 {
-    font-size:20px;
-}
-.tag-size-10 {
-    font-size:21px;
-}
-
-ul.tags,
-ul.tags.marked-tags,
-ul#related-tags {
-    list-style: none;
-    margin: 0;
-    padding: 0;
-    line-height: 170%;
-    display: block;
-}
-
-ul.tags li {
-    float:left;
-    display: block;
-    margin: 0 5px 0 0;
-    padding: 0;
-}
-
-.wildcard-tags {
-    clear: both;
-}
-
-ul.tags.marked-tags li,
-.wildcard-tags ul.tags li {
-    margin-bottom: 5px;
-}
-
-#tagSelector div.inputs {
-    clear: both;
-    float: none;
-    margin-bottom:10px;
-}
-
-.tags-page ul.tags li,
-ul#ab-user-tags li {
-    width: 160px;
-}
-
-ul#related-tags li {
-    margin: 0 5px 3px 0;
-    float: left;
-    clear: left;
-}
-
-/* .tag-left and .tag-right are for the sliding doors decoration of tags */
-.tag-left {
-    background: url(../images/tag-right.png) no-repeat right center;
-    border: none;
-    cursor: pointer;
-    display: block;
-    float: left;
-    height: 18px;
-    margin: 0 5px 0 0;
-    padding: 0;
-}
-
-.tag-right {
-    background: url(../images/tag-left.png) no-repeat left center;
-    border: none;
-    display: block;
-    float: left;
-    height: 18px;
-    line-height: 20px;
-    font-weight: normal;
-    font-size: 11px;
-    padding: 0px 7px 0px 15px;
-    text-decoration: none;
-    text-align: center;
-    white-space: nowrap;
-    vertical-align: middle;
-}
-
-.deletable-tag {
-    margin-right: 3px;
-    white-space: nowrap;
-}
-
-.deletable-tag .tag-right {
-    padding-right: 0px;
-    float: left;
-}
-.deletable-tag.tag-left {
-    padding-right: 3px;
-}
-
-.tags a.tag-right,
-.tags span.tag-right {
-    color: #333;
-    text-decoration: none;
-}
-
-
-.users-page h1, .tags-page h1 {
-    float: left;
-}
-
-.main-page h1 {
-    margin-right: 5px;
-}
-
-#askFormBar {
-    display:inline-block;
-    background-color: #e3e3e3;/*888a85; /*#e9b96e;*/
-    border: 1px solid #aaaaaa;
-    padding: 4px 7px 5px 5px;
-}
-#askFormBar p {
-    width: 685px;
-    margin:0 0 5px 0;
-}
-#askFormBar .questionTitleInput {
-    font-size: 24px;
-    line-height: 24px;
-    height: 36px;
-    width: 680px;
-    margin: 0px;
-    padding: 5px 0 0 5px;
-}
-
-#question-list {
-    float: left;
-    position: relative;
-    background-color: #FFF;
-    padding: 0;
-    width: 100%;
-}
-
-.ask-page div#question-list {
-    float: none;
-    width: 706px;
-}
-.ask-page div#question-list h2 {
-    font-size: 14px;
-    padding-bottom: 0;
-}
-.ask-page div#question-list span {
-    padding: 3px 7px;
-    margin-right: 5px;
-    background: #ccc;
-}
-
-
-
-span.delete-icon {
-    padding-left: 13px;
-    vertical-align: bottom;
-    background: url(../images/close-small-dark.png) no-repeat;
-    cursor: default;
-}
-span.delete-icon:hover {
-    background: url(../images/close-small-hover.png) no-repeat;
-}
-
-.tags span.delete-icon {
-    float: left;
-    height: 15px;
-    margin: 2px 0 0 1px;
-    display: block;
-}
-
-.tag-number {
-    font-weight: 700;
-    display: block;
-    float: left;
-    font-family: sans-serif;
-}
-
-.badges .tag-number {
-    float: none;
-    display: inline;
-    padding-right: 15px;
-}
-
 /* ----- Sorting top Tab, check main_page/tab_bar.html ------*/
 
 .tabBar {
     background-color: #eff5f6;
     height: 30px;
-    width: 412px;
-    clear: both;
+    width: 336px;
     margin-bottom: 3px;
     margin-top: 3px;
     float:right;
@@ -784,7 +574,7 @@ span.delete-icon:hover {
 .tabsA a, .tabsC a{
 
     border-left: 1px solid #d0e1e4;
-    color: #8b1717;
+    color: @section-title;
     display: block;
     float: left;
     height: 20px;
@@ -794,7 +584,7 @@ span.delete-icon:hover {
 }
 
 .tabsA a.on, .tabsC a.on, .tabsA a:hover, .tabsC a:hover {
-    color: #C22828;
+    color: @button-label;
 }
 
 .tabsA a.rev.on, tabsA a.rev.on:hover {
@@ -823,12 +613,15 @@ span.delete-icon:hover {
 .rss {
     float: right;
     font-size: 16px;
-    color: #f57900 !important;
-    margin: 1px 8px 0 0;
-    width:45px;
+    color: #f57900;
+    margin: 5px 0px 3px 7px;
+    width:52px;
     padding-left: 16px;
     padding-top:3px;
-    background: url(../images/feed-icon-small.png) no-repeat center right;
+    background:#fff url(../images/feed-icon-small.png) no-repeat center right;
+    float:right;
+    font-family:@georgia;
+    font-size:16px;
 }
 
 .rss:hover {
@@ -841,7 +634,10 @@ span.delete-icon:hover {
     font-weight:bold;
     font-size:23px;
     color:@section-title;
-    width:100%;
+    width:200px;
+    float:left;
+    margin-bottom:8px;
+    padding-top:6px;
 }
 
 #listSearchTags{
@@ -885,9 +681,10 @@ ul#searchTags {
     background: url(../images/summary-background.png) repeat-x;
     
     h2 {
-         font-size: 22px;
+         font-size: 24px;
         font-weight:normal;
         padding-left: 0;
+        margin-bottom:20px;
     }
     
     a {
@@ -939,6 +736,8 @@ ul#searchTags {
     
     .tags {
         margin-top: 0;
+        position:absolute;
+        bottom:10px;
     }
     
     .votes, .answers, .favorites, .views {
@@ -1085,6 +884,224 @@ ul#searchTags {
 
 }
 
+/* ----- Tags Styles ----- */
+
+/* tag formatting is also copy-pasted in template
+   because it must be the same in the emails
+   askbot/models/__init__.py:format_instant_notification_email()
+*/
+
+/* tag cloud */
+
+.tag-size-1 {
+    font-size:12px;
+}
+.tag-size-2 {
+    font-size:13px;
+}
+.tag-size-3 {
+    font-size:14px;
+}
+.tag-size-4 {
+    font-size:15px;
+}
+.tag-size-5 {
+    font-size:16px;
+}
+.tag-size-6 {
+    font-size:17px;
+}
+.tag-size-7 {
+    font-size:18px;
+}
+.tag-size-8 {
+    font-size:19px;
+}
+.tag-size-9 {
+    font-size:20px;
+}
+.tag-size-10 {
+    font-size:21px;
+}
+
+ul.tags,
+ul.tags.marked-tags,
+ul#related-tags {
+    list-style: none;
+    margin: 0;
+    padding: 0;
+    line-height: 170%;
+    display: block;
+}
+
+ul.tags li {
+    float:left;
+    display: block;
+    margin: 0 5px 0 0;
+    padding: 0;
+    height:20px;
+}
+
+.wildcard-tags {
+    clear: both;
+}
+
+ul.tags.marked-tags li,
+.wildcard-tags ul.tags li {
+    margin-bottom: 5px;
+}
+
+#tagSelector div.inputs {
+    clear: both;
+    float: none;
+    margin-bottom:10px;
+}
+
+.tags-page ul.tags li,
+ul#ab-user-tags li {
+    width: 160px;
+}
+
+ul#related-tags li {
+    margin: 0 5px 3px 0;
+    float: left;
+    clear: left;
+}
+
+/* .tag-left and .tag-right are for the sliding doors decoration of tags */
+
+.tag-left {
+    background: url(../images/tag-right.png) no-repeat right center;
+    border: none;
+    cursor: pointer;
+    display: block;
+    float: left;
+    height: 20px;
+    margin: 0 5px 0 0;
+    padding: 0;
+}
+
+.tag-right {
+    background:url(../images/tag-left.png) no-repeat left center;
+    border: none;
+    display: block;
+    float: left;
+    height: 20px;
+    line-height: 20px;
+    font-weight: normal;
+    font-size: 11px;
+    padding: 0px 10px 0px 15px;
+    text-decoration: none;
+    text-align: center;
+    white-space: nowrap;
+    vertical-align: middle;
+    font-family:@trebuchet;
+    color:#717179;
+}
+.deletable-tag {
+    margin-right: 3px;
+    white-space: nowrap;
+}
+
+.deletable-tag .tag-right {
+    padding-right: 0px;
+    float: left;
+}
+.deletable-tag.tag-left {
+    padding-right: 3px;
+}
+
+.tags a.tag-right,
+.tags span.tag-right {
+    color: #585858;
+    text-decoration: none;
+
+}
+.tags a:hover{
+    color: #1A1A1A;
+}
+
+
+.users-page h1, .tags-page h1 {
+    float: left;
+}
+
+.main-page h1 {
+    margin-right: 5px;
+}
+
+#askFormBar {
+    display:inline-block;
+    background-color: #e3e3e3;/*888a85; /*#e9b96e;*/
+    border: 1px solid #aaaaaa;
+    padding: 4px 7px 5px 5px;
+}
+#askFormBar p {
+    width: 685px;
+    margin:0 0 5px 0;
+}
+#askFormBar .questionTitleInput {
+    font-size: 24px;
+    line-height: 24px;
+    height: 36px;
+    width: 680px;
+    margin: 0px;
+    padding: 5px 0 0 5px;
+}
+
+#question-list {
+    float: left;
+    position: relative;
+    background-color: #FFF;
+    padding: 0;
+    width: 100%;
+}
+
+.ask-page div#question-list {
+    float: none;
+    width: 706px;
+}
+.ask-page div#question-list h2 {
+    font-size: 14px;
+    padding-bottom: 0;
+}
+.ask-page div#question-list span {
+    padding: 3px 7px;
+    margin-right: 5px;
+    background: #ccc;
+}
+
+span.delete-icon {
+    padding-left: 13px;
+    vertical-align: bottom;
+    background: url(../images/close-small-dark.png) no-repeat;
+    cursor: default;
+}
+span.delete-icon:hover {
+    background: url(../images/close-small-hover.png) no-repeat;
+}
+
+.tags span.delete-icon {
+    float: left;
+    height: 15px;
+    margin: 2px 0 0 1px;
+    display: block;
+}
+
+.tag-number {
+    font-weight: 700;
+    display: block;
+    float: left;
+    font-family: sans-serif;
+}
+
+.badges .tag-number {
+    float: none;
+    display: inline;
+    padding-right: 15px;
+}
+
+
 /* ----- Footer links , check blocks/footer.html----- */
 
 #ground {
diff --git a/askbot/skins/default/templates/main_page/headline.html b/askbot/skins/default/templates/main_page/headline.html
index 49ba93da..2249a83f 100644
--- a/askbot/skins/default/templates/main_page/headline.html
+++ b/askbot/skins/default/templates/main_page/headline.html
@@ -1,6 +1,5 @@
 {% import "macros/macros.html" as macros %}
 {% if questions_count > 0 %}
-    <div style="clear:both">
         <h1 id="questionCount" class="search-result-summary">
             {% trans cnt=questions_count, q_num=questions_count|intcomma %}{{q_num}} question{% pluralize %}{{q_num}} questions{% endtrans %}
         {% if author_name %}
@@ -39,6 +38,4 @@
         {% else %}
             <p class="search-tips"><b>{% trans %}Search tip:{% endtrans %}</b> {% trans %}add tags and a query to focus your search{% endtrans %}</p>
         {% endif %}
-        <div class="clean"></div>
-    </div>
 {% endif %}
diff --git a/askbot/skins/default/templates/main_page/tab_bar.html b/askbot/skins/default/templates/main_page/tab_bar.html
index 302b0ed4..45009c21 100644
--- a/askbot/skins/default/templates/main_page/tab_bar.html
+++ b/askbot/skins/default/templates/main_page/tab_bar.html
@@ -1,5 +1,10 @@
 {% import "macros/macros.html" as macros %}
 {% cache 0 "scope_sort_tabs" search_tags request.user scope sort query context.page context.page_size language_code %}
+<a class="rss"
+    href="{{settings.APP_URL}}/feeds/rss/"
+    title="{% trans %}subscribe to the questions feed{% endtrans %}"
+    >{% trans %}RSS{% endtrans %}
+</a>
 <div class="tabBar">
     <div id="sort_tabs" class="tabsA">
         <span class="label">{% trans %}Sort by &raquo;{% endtrans %}</span>
@@ -61,11 +66,8 @@
                 current_sort_method = sort
             )
         }}
-        <a class="rss"
-            href="{{settings.APP_URL}}/feeds/rss/"
-            title="{% trans %}subscribe to the questions feed{% endtrans %}"
-            >{% trans %}RSS{% endtrans %}
-        </a>
+
     </div>
 </div>
+
 {% endcache %}
diff --git a/askbot/skins/default/templates/widgets/tag_selector.html b/askbot/skins/default/templates/widgets/tag_selector.html
index 3346f61b..8b4f561d 100644
--- a/askbot/skins/default/templates/widgets/tag_selector.html
+++ b/askbot/skins/default/templates/widgets/tag_selector.html
@@ -15,7 +15,7 @@
     #}
     <div class="inputs">
         <input id="interestingTagInput" autocomplete="off" type="text"/>&nbsp;
-        <input id="interestingTagAdd" type="submit" value="{% trans %}+{% endtrans %}"/>
+        <input id="interestingTagAdd" type="submit" value="{% trans %}add{% endtrans %}"/>
     </div>
     <h2>{% trans %}Ignored tags{% endtrans %}</h2>
     {{
@@ -31,7 +31,7 @@
     #}
     <div class="inputs">
         <input id="ignoredTagInput" autocomplete="off" type="text"/>&nbsp;
-        <input id="ignoredTagAdd" type="submit" value="{% trans %}+{% endtrans%}"/>
+        <input id="ignoredTagAdd" type="submit" value="{% trans %}add{% endtrans%}"/>
     </div>
     <h3>{% trans %}Display tag filter{% endtrans%}</h3>
     <div id="displayTagFilterControl">