diff options
author | Adolfo Fitoria <adolfo.fitoria@gmail.com> | 2011-10-13 09:29:38 -0300 |
---|---|---|
committer | Adolfo Fitoria <adolfo.fitoria@gmail.com> | 2011-10-13 09:29:38 -0300 |
commit | 85dcc633818eaeab4f5ad0036043a6ddf0ddccab (patch) | |
tree | 80986e543fa8cae7db502a36373251ce893d740c | |
parent | 2dad823e2b3791da8abc234bba20e66c6e6b5f7b (diff) | |
parent | eef84c3525143adde0865226dd12ca93ba3b868b (diff) | |
download | askbot-85dcc633818eaeab4f5ad0036043a6ddf0ddccab.tar.gz askbot-85dcc633818eaeab4f5ad0036043a6ddf0ddccab.tar.bz2 askbot-85dcc633818eaeab4f5ad0036043a6ddf0ddccab.zip |
Merge branch 'new-template' into new-template-experimental
-rw-r--r-- | askbot/skins/default/media/images/accept.png | bin | 0 -> 727 bytes | |||
-rw-r--r-- | askbot/skins/default/media/images/answers-background.png | bin | 0 -> 235 bytes | |||
-rw-r--r-- | askbot/skins/default/media/images/view-background.png | bin | 0 -> 265 bytes | |||
-rw-r--r-- | askbot/skins/default/media/images/vote-background.png | bin | 0 -> 225 bytes | |||
-rw-r--r-- | askbot/skins/default/media/style/lib_style.less | 9 | ||||
-rw-r--r-- | askbot/skins/default/media/style/style.css | 310 | ||||
-rw-r--r-- | askbot/skins/default/templates/blocks/header.html | 17 | ||||
-rw-r--r-- | askbot/skins/default/templates/blocks/secundary_header.html | 9 | ||||
-rw-r--r-- | askbot/skins/default/templates/blocks/system_messages.html | 2 | ||||
-rw-r--r-- | askbot/skins/default/templates/macros/macros.html | 2 | ||||
-rw-r--r-- | askbot/skins/default/templates/main_page/headline.html | 30 |
11 files changed, 203 insertions, 176 deletions
diff --git a/askbot/skins/default/media/images/accept.png b/askbot/skins/default/media/images/accept.png Binary files differnew file mode 100644 index 00000000..16262c7a --- /dev/null +++ b/askbot/skins/default/media/images/accept.png diff --git a/askbot/skins/default/media/images/answers-background.png b/askbot/skins/default/media/images/answers-background.png Binary files differnew file mode 100644 index 00000000..0e9b4788 --- /dev/null +++ b/askbot/skins/default/media/images/answers-background.png diff --git a/askbot/skins/default/media/images/view-background.png b/askbot/skins/default/media/images/view-background.png Binary files differnew file mode 100644 index 00000000..5e951f40 --- /dev/null +++ b/askbot/skins/default/media/images/view-background.png diff --git a/askbot/skins/default/media/images/vote-background.png b/askbot/skins/default/media/images/vote-background.png Binary files differnew file mode 100644 index 00000000..0e1ded6e --- /dev/null +++ b/askbot/skins/default/media/images/vote-background.png diff --git a/askbot/skins/default/media/style/lib_style.less b/askbot/skins/default/media/style/lib_style.less index d1424137..ac49aed0 100644 --- a/askbot/skins/default/media/style/lib_style.less +++ b/askbot/skins/default/media/style/lib_style.less @@ -3,10 +3,17 @@ /* Variables for Colors*/ @header-color:#16160f; - @link:#1b79bd; @question-link:#464646; @button-label:#4a757f; +@section-title:#7ea9b3; +@info-text:#8d8d8d; + +/* Variables for fonts*/ + +@trebuchet:"Trebuchet MS", sans-serif; +@georgia:Georgia, serif; +@yanone:'Yanone Kaffeesatz', sans-serif; /* Receive exactly positions for background Sprite */ diff --git a/askbot/skins/default/media/style/style.css b/askbot/skins/default/media/style/style.css index 82a812d4..60022a14 100644 --- a/askbot/skins/default/media/style/style.css +++ b/askbot/skins/default/media/style/style.css @@ -10,7 +10,7 @@ body { margin: 0; padding: 0; color: #000; - font-family: 'Yanone Kaffeesatz', sans-serif; + font-family: @yanone; } div { @@ -153,7 +153,7 @@ h1 { .clean{clear:both} -/* ----- Notify message bar ----- */ +/* ----- Notify message bar , check blocks/system_messages.html ----- */ .notify { position: fixed; @@ -174,7 +174,7 @@ h1 { } } -#close-notify { +#closeNotify { position: absolute; right: 5px; top: 7px; @@ -187,11 +187,11 @@ h1 { height:20px; } -#close-notify:hover { +#closeNotify:hover { .sprites(-26px,-5px); } -/* ----- Header ----- */ +/* ----- Header, check blocks/header.html ----- */ #header { margin-top: 0px; @@ -208,7 +208,7 @@ h1 { padding: 5px 0px 5px 0px; } -#user-tools-nav { +#userToolsNav {/* Navigation bar containing login link or user information, check blocks/user_navigation.html*/ height: 20px; position:absolute; bottom: 0; @@ -247,7 +247,7 @@ h1 { } } -#meta-nav { +#metaNav {/* Top Navigation bar containing links for tags, people and badges, check blocks/header.html */ float:right; a { @@ -284,26 +284,26 @@ h1 { text-decoration: underline; } - #nav_tags{ + #navTags{ .sprites(-50px,-5px) } - #nav_users{ + #navUsers{ .sprites(-125px,-5px) } - #nav_badges{ + #navBadges{ .sprites(-210px,-5px) } } -#secundary-header{ +#secundaryHeader{ /* Div containing Home button, scope navigation, search form and ask button, check blocks/secondary_header.html */ height:55px; background:#e9e9e1; border-bottom:#d3d3c2 1px solid; margin-bottom:10px; - #home-button{ + #homeButton{ border-right:#afaf9e 1px solid; .sprites(-6px,-36px); height:55px; @@ -312,11 +312,11 @@ h1 { float:left; } - #home-button:hover{ + #homeButton:hover{ .sprites(-6px-45,-36px); } - #scope-wrapper{ + #scopeWrapper{ width:688px; float:left; @@ -338,7 +338,7 @@ h1 { } } -#searchBar { +#searchBar { /* Main search form , check blocks/input_bar.html */ display:inline-block; background-color: #fff; width:412px; @@ -401,7 +401,7 @@ h1 { } } -#ask-button{ +#askButton{ /* check blocks/secondary_header.html */ background: url(../images/bigbutton.png) repeat-x bottom; line-height:44px; text-align:center; @@ -416,13 +416,13 @@ h1 { .box-shadow(1px, 1px, 2px, #636363) } -#ask-button:hover{ +#askButton:hover{ text-decoration:none; background: url(../images/bigbutton.png) repeat-x top; .text-shadow(0px, 1px, 0px, #c6d9dd) } -/* ----- Content layout ----- */ +/* ----- Content layout, check two_column_body.html or one_column_body.html ----- */ #ContentLeft { width: 730px; @@ -441,11 +441,11 @@ h1 { width: 950px; } -/* ----- Sidebar Widgets Box ----- */ +/* ----- Sidebar Widgets Box, check main_page/sidebar.html ----- */ .box { background: #fff; - padding: 10px 0px 0px 0px; + padding: 4px 0px 10px 0px; p { @@ -738,11 +738,7 @@ span.delete-icon:hover { padding-right: 15px; } -ul#search-tags { - padding-top: 3px; -} - -/* ----- Sorting top Tab ------*/ +/* ----- Sorting top Tab, check main_page/tab_bar.html ------*/ .tabBar { background-color: #eff5f6; @@ -752,7 +748,7 @@ ul#search-tags { margin-bottom: 3px; margin-top: 3px; float:right; - font-family:Georgia; + font-family:@georgia; font-size:16px; .rounded-corners(5px); } @@ -791,8 +787,6 @@ ul#search-tags { .tabsA a.rev.on, tabsA a.rev.on:hover { } - - .tabsA .label, .tabsC .label { float: left; color: #646464; @@ -828,8 +822,43 @@ ul#search-tags { color: #F4A731 !important; } +/* ----- Headline, containing number of questions and tags selected, check main_page/headline.html ----- */ -/* ----- Question list ----- */ +#questionCount{ + font-weight:bold; + font-size:23px; + color:@section-title; + width:100%; +} + +#listSearchTags{ + float:left; + margin-top:3px; + color:@info-text; + font-size:16px; +} + +ul#searchTags { + margin-left:10px; + float:right; + padding-top:2px; +} + +.search-tips { + font-size:16px; + line-height:17px; + color: @info-text; + margin:5px 0 10px 0; + padding:0px; + float:left; + + a { + text-decoration: underline; + color: @link; + } +} + +/* ----- Question list , check main_page/content.html and macros.html----- */ .short-summary { position: relative; @@ -841,120 +870,129 @@ ul#search-tags { width: 710px; float: left; background: url(../images/summary-background.png) repeat-x; -} - -.short-summary h2 { - font-size: 22px; - font-weight:normal; -} - -.short-summary a { - color:@question-link; -} + + h2 { + font-size: 22px; + font-weight:normal; + padding-left: 0; + } + + a { + color:@question-link; + } + .userinfo { + text-align:right; + line-height:16px; + font-family:@trebuchet; + padding-right:4px; + } + -.short-summary .userinfo .relativetime, -.short-summary .userinfo a, -.short-summary span.anonymous { - font-size: 11px; - clear:both; - font-weight: normal; - color: #555; -} + .userinfo .relativetime, span.anonymous + { + font-size: 11px; + clear:both; + font-weight: normal; + color: #555; + } + .userinfo a{ + font-weight:bold; + font-size:11px; + } + + .counts { + float: right; + margin: 4px 0 0 5px; + } + + .counts .item-count { + padding:0px 5px 0px 5px; + font-size: 25px; + font-family:@yanone; + } + + .counts .votes div, + .counts .views div, + .counts .answers div, + .counts .favorites div + { + margin-top:3px; + font-size: 14px; + line-height:14px; + color: #646464; + } + + .tags { + margin-top: 0; + } + + .votes, .answers, .favorites, .views { + text-align: center; + margin: 0 3px; + padding: 8px 2px 0px 2px; + width: 51px; + float: right; + height:44px; + border:#dbdbd4 1px solid; + } -.short-summary .userinfo { - text-align:center; - line-height:16px; -} + .votes{ + background: url(../images/vote-background.png) repeat-x; + } -.short-summary .counts { - float: right; - margin: 2px 0 0 5px; -} + .answers{ + background:url(../images/answers-background.png) repeat-x; + } + + .views { + background:url(../images/view-background.png) repeat-x; + } -.short-summary .counts .item-count { - border:1px solid #cccccc; - -moz-border-radius:5px; - -webkit-border-radius:5px; - padding:0px 5px 0px 5px; - font-size: 17px; - font-weight: 800; -} + .no-votes .item-count { + color: #b1b5b6; + } + .some-votes .item-count { + color: #4a757f; + } + + .no-answers .item-count { + color: #b1b5b6; + } + .some-answers .item-count { + color: #eab243; + } + + .no-views .item-count { + color: #b1b5b6; + } + .some-views .item-count { + color: #d33f00; + } + + .accepted .item-count { + background:url(../images/accept.png) no-repeat top right; + display: block; + text-align: center; + width: 40px; + color: #eab243; + } -.short-summary .counts .votes div, -.short-summary .counts .views div, -.short-summary .counts .answers div, -.short-summary .counts .favorites div -{ - font-size: 12px; - line-height:14px; - color: #555; -} + .some-favorites .item-count { + background:#338333; + color:#d0f5a9; + } + .no-favorites .item-count { + background: #eab243; + color: yellow; + } -.short-summary .tags { - margin-top: 0; } -.no-votes .item-count { - background: white; - color: gray; -} -.some-votes .item-count { - background: #a3d0ff; - color: #4a4a4a; -} -.no-answers .item-count { - background: #b63333; - color: yellow; -} -.no-favorites .item-count { - background: #b63333; - color: yellow; -} -.some-answers .item-count { - background: #ffed9c; - color: #a4a4a4; -} -.some-favorites .item-count { - background:#338333; - color:#d0f5a9; -} -.accepted .item-count { - background:#338333; - color:#d0f5a9; -} -.no-views .item-count { - background: gray; - color: white; -} -.some-views .item-count { - background: #ff8c8c; - color: #4a4a4a; -} -.short-summary .votes, -.short-summary .answers, -.short-summary .favorites, -.short-summary .views { - text-align: center; - margin: 0 3px; - padding: 4px 2px 0px 2px; - width: 46px; - float: right; - -moz-border-radius: 5px; - -khtml-border-radius: 5px; - -webkit-border-radius: 5px; -} -.short-summary .views { - width: 36px; - padding-right: 0; -} -.short-summary h2 { - padding-left: 0; -} #question-table, .answer-table { @@ -2401,18 +2439,6 @@ p.signup_p { padding:2px 0 0 0; float: left; } -.search-tips { - font-size:12px; - line-height:12px; - color: #555; - margin:0 0 5px 0; - padding:0px; - clear:both; -} -.search-tips a { - text-decoration: underline; - color: #555; -} .faq-rep-item { text-align:right; diff --git a/askbot/skins/default/templates/blocks/header.html b/askbot/skins/default/templates/blocks/header.html index 5ee9e52d..042fe115 100644 --- a/askbot/skins/default/templates/blocks/header.html +++ b/askbot/skins/default/templates/blocks/header.html @@ -9,34 +9,27 @@ title="{% trans %}back to home page{% endtrans %}" alt="{% trans site=settings.APP_SHORT_NAME %}{{site}} logo{% endtrans %}"/></a> {% endif %} - <div id="user-tools-nav"> + <div id="userToolsNav"> {% include "blocks/user_navigation.html" %} {{settings.CUSTOM_HEADER}} </div> - <div id="meta-nav"> + <div id="metaNav"> <a - id="nav_tags" + id="navTags" href="{% url tags %}" {% if active_tab == 'tags' %}class="on"{% endif %} >{% trans %}tags{% endtrans %}</a> <a - id="nav_users" + id="navUsers" href="{% url users %}" {% if active_tab == 'users' %}class="on"{% endif %} >{% trans %}users{% endtrans %}</a> <a - id="nav_badges" + id="navBadges" href="{% url badges %}" {% if active_tab == 'badges' %}class="on"{% endif %} >{% trans %}badges{% endtrans %}</a> - <!-- - <a - id="nav_ask" - href="{% url ask %}" - class="{% if active_tab == 'ask' %}on{% else %}special{% endif %}" - >{% trans %}ask a question{% endtrans %}</a> - --> </div> <div class="clean"></div> </div> diff --git a/askbot/skins/default/templates/blocks/secundary_header.html b/askbot/skins/default/templates/blocks/secundary_header.html index bce63cec..6b0e0878 100644 --- a/askbot/skins/default/templates/blocks/secundary_header.html +++ b/askbot/skins/default/templates/blocks/secundary_header.html @@ -1,10 +1,9 @@ <!-- template secundary_header.html --> -<div id="secundary-header"> +<div id="secundaryHeader"> <div class="content-wrapper"> - - <a id="home-button" href="{% url questions %}"></a> - <div id="scope-wrapper"> + <a id="homeButton" href="{% url questions %}"></a> + <div id="scopeWrapper"> <a class="scope-selector {% if scope == 'all' %}on{% endif %}" href="{% url questions %}?scope=all" title="{% trans %}see all questions{% endtrans %}">ALL</a> <a class="scope-selector {% if scope == 'unanswered' %}on{% endif %}" @@ -16,7 +15,7 @@ {% include "blocks/input_bar.html" %} {# include search form block #} </div> - <a id="ask-button" href="{% url ask %}">{% trans %}ask a question{% endtrans %}</a> + <a id="askButton" href="{% url ask %}">{% trans %}ask a question{% endtrans %}</a> <div class="clean"></div> </div> </div> diff --git a/askbot/skins/default/templates/blocks/system_messages.html b/askbot/skins/default/templates/blocks/system_messages.html index 97bb4b51..6b803846 100644 --- a/askbot/skins/default/templates/blocks/system_messages.html +++ b/askbot/skins/default/templates/blocks/system_messages.html @@ -4,5 +4,5 @@ <p>{{ message }}</p> {% endfor %} {% endif %} - <a id="close-notify" onclick="notify.close(true)"></a> + <a id="closeNotify" onclick="notify.close(true)"></a> </div> diff --git a/askbot/skins/default/templates/macros/macros.html b/askbot/skins/default/templates/macros/macros.html index f94c62aa..40ca1e64 100644 --- a/askbot/skins/default/templates/macros/macros.html +++ b/askbot/skins/default/templates/macros/macros.html @@ -231,7 +231,7 @@ poor design of the data or methods on data objects #} {%- endif -%}"> <span class="item-count" - >{{question.answer_count|humanize_counter}}{% if question.answer_accepted%}✓{% endif %}</span> + >{{question.answer_count|humanize_counter}}{% if question.answer_accepted%}{% endif %}</span> <div> {% trans cnt=question.answer_count %}answer{% pluralize %}answers{% endtrans %} </div> diff --git a/askbot/skins/default/templates/main_page/headline.html b/askbot/skins/default/templates/main_page/headline.html index 94b249ba..49ba93da 100644 --- a/askbot/skins/default/templates/main_page/headline.html +++ b/askbot/skins/default/templates/main_page/headline.html @@ -1,25 +1,26 @@ {% import "macros/macros.html" as macros %} {% if questions_count > 0 %} <div style="clear:both"> - <h1 id="question-count" class="search-result-summary"> - {% if search_tags %} - {% trans cnt=questions_count, q_num=questions_count|intcomma %}{{q_num}} question, tagged{% pluralize %}{{q_num}} questions, tagged{% endtrans %} - {% else %} + <h1 id="questionCount" class="search-result-summary"> {% trans cnt=questions_count, q_num=questions_count|intcomma %}{{q_num}} question{% pluralize %}{{q_num}} questions{% endtrans %} - {% endif %} {% if author_name %} {% trans %}with {{author_name}}'s contributions{% endtrans %} {% endif %} </h1> - {{ macros.tag_list_widget( - search_tags, - id = 'search-tags', - deletable = True, - make_links = False - ) - }} + {% if search_tags %} + <div id="listSearchTags"> + <span class="left">Tagged</span> + {{ macros.tag_list_widget( + search_tags, + id = 'searchTags', + deletable = True, + make_links = False + ) + }} + </div> + {% endif %} {% if author_name or search_tags or query %} - <p class="search-tips">{% trans %}Search tips:{% endtrans %} + <p class="search-tips"><b>{% trans %}Search tips:{% endtrans %}</b> {% if reset_method_count > 1 %} {% if author_name %} <a href="{% url questions %}?reset_author=true">{% trans %}reset author{% endtrans %}</a> @@ -36,7 +37,8 @@ {% trans %} - to expand, or dig in by adding more tags and revising the query.{% endtrans %} </p> {% else %} - <p class="search-tips">{% trans %}Search tip:{% endtrans %} {% trans %}add tags and a query to focus your search{% endtrans %}</p> + <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 %} |