Commit 4826b688 authored by Giuseppe Terrasi's avatar Giuseppe Terrasi

merge from lp:~ricki-padovani/ubuntu-it-ask/planet

Modificato il layout della sidebar, in stile planet
parents 6386e735 6256b716
...@@ -193,15 +193,20 @@ blockquote blockquote { ...@@ -193,15 +193,20 @@ blockquote blockquote {
margin: auto; margin: auto;
min-width: 985px; min-width: 985px;
margin: 0 20px; margin: 0 20px;
background-color: #FFF;
} }
#announcement { #announcement {
padding: 0 5px; padding: 0 5px;
} text-align: center;
margin: 5px 20px;
#fixed-header { height: 35px;
height: 120px; font-size: 17px;
background: none repeat scroll 0 0 rgba(0, 0, 0, 0.6);
border-radius: 5px 5px 5px 5px;
-moz-border-radius: 5px 5px 5px 5px;
-webkit-border-radius: 5px 5px 5px;
line-height: 2;
color: white;
} }
.container { .container {
...@@ -264,6 +269,10 @@ blockquote blockquote { ...@@ -264,6 +269,10 @@ blockquote blockquote {
text-decoration: none; text-decoration: none;
} }
#fixed-header {
height: 105px;
}
#page-header { display: none; } #page-header { display: none; }
#page-body { #page-body {
overflow: hidden; overflow: hidden;
...@@ -403,24 +412,38 @@ padding-top: 4px; ...@@ -403,24 +412,38 @@ padding-top: 4px;
padding: 5px; padding: 5px;
} }
#room {
border: 1px solid #DD4814;
background-color: #E7E7E7;
padding: 5px;
}
#CALeft { #CALeft {
float: left; float: left;
width: 84%; width: 84%;
background-color: #e4e4e4;
padding: 5px;
border: solid 1px #D4D4D4;
border-radius: 3px;
} }
#CARight { #CARight {
float: right; float: right;
width: 15%; width: 15%;
color: #EEE;
}
#CARight h3 {
background-color: transparent;
font-size: 20px;
text-align: center;
color: #E0E0E0;
text-shadow: 1px 1px 1px #222;
}
#CARight p {
font-size: 14px;
} }
#CAFull { #CAFull {
float: left; float: left;
background-color: #e4e4e4;
border: solid 1px #D4D4D4;
border-radius: 3px;
width: 100%; width: 100%;
} }
...@@ -525,7 +548,7 @@ padding-top: 4px; ...@@ -525,7 +548,7 @@ padding-top: 4px;
} }
.questions-count { .questions-count {
color: #A40000; color: #DD4818;
font-family: sans-serif; font-family: sans-serif;
font-size: 24px; font-size: 24px;
font-weight: 600; font-weight: 600;
...@@ -562,12 +585,16 @@ padding-top: 4px; ...@@ -562,12 +585,16 @@ padding-top: 4px;
} }
.boxC { .boxC {
background-color: #D7D7D7; padding-left: 10px;
border-left: 1px solid #DD4814; padding-right: 10px;
border-bottom: 1px solid #DD4814; padding-bottom: 5px;
padding: 10px; padding-top: 5px;
margin-right: -5px; margin-left: 5px;
margin-top: -5px; margin-bottom: 10px;
background: none repeat scroll 0 0 rgba(0, 0, 0, 0.6);
border-radius: 5px 5px 5px 5px;
-moz-border-radius: 5px 5px 5px 5px;
-webkit-border-radius: 5px 5px 5px;
} }
.boxC p { .boxC p {
...@@ -669,8 +696,6 @@ padding-top: 4px; ...@@ -669,8 +696,6 @@ padding-top: 4px;
.tags a, span.tag, .tags-summary a { .tags a, span.tag, .tags-summary a {
background-color: #EEEEEE; background-color: #EEEEEE;
border-bottom: 1px solid #CCCCCC;
border-right: 1px solid #CCCCCC;
color: #777777; color: #777777;
font-size: 11px; font-size: 11px;
font-weight: normal; font-weight: normal;
...@@ -697,8 +722,7 @@ padding-top: 4px; ...@@ -697,8 +722,7 @@ padding-top: 4px;
.medal { .medal {
background: none repeat scroll 0 0 #DD4818; background: none repeat scroll 0 0 #DD4818;
border: #DD4818 solid 1px; color: white;
color: #333333;
font-size: 14px; font-size: 14px;
font-weight: bold; font-weight: bold;
line-height: 250%; line-height: 250%;
...@@ -713,7 +737,6 @@ a.medal { ...@@ -713,7 +737,6 @@ a.medal {
a.medal:hover { a.medal:hover {
/*background: url("../images/medala_on.gif") no-repeat scroll 0 0 transparent;*/ /*background: url("../images/medala_on.gif") no-repeat scroll 0 0 transparent;*/
background-color: white; background-color: white;
border: #DD4818 solid 1px;
color: #DD4818; color: #DD4818;
text-decoration: none; text-decoration: none;
} }
...@@ -721,7 +744,7 @@ a.medal:hover { ...@@ -721,7 +744,7 @@ a.medal:hover {
.tabBar { .tabBar {
clear: both; clear: both;
height: 30px; height: 30px;
margin-bottom: 3px; margin: 3px;
width: 100%; width: 100%;
} }
...@@ -838,7 +861,7 @@ a.medal:hover { ...@@ -838,7 +861,7 @@ a.medal:hover {
.questions-related { .questions-related {
font-weight: 700; font-weight: 700;
word-wrap: break-word; /*word-wrap: break-word;*/
} }
.questions-related p { .questions-related p {
...@@ -953,7 +976,7 @@ div.question-body p, div.answer-body p { ...@@ -953,7 +976,7 @@ div.question-body p, div.answer-body p {
margin: 0; margin: 0;
} }
.badge-list a { /*.badge-list a {
color: #DD4818; color: #DD4818;
} }
...@@ -963,7 +986,7 @@ div.question-body p, div.answer-body p { ...@@ -963,7 +986,7 @@ div.question-body p, div.answer-body p {
.badge-list a.medal:hover { .badge-list a.medal:hover {
color: #DD4818; color: #DD4818;
} }*/
#medalList .badgeListDescription { #medalList .badgeListDescription {
float: left; float: left;
...@@ -1175,6 +1198,7 @@ ins { ...@@ -1175,6 +1198,7 @@ ins {
width: 90%; width: 90%;
border: 3px solid #DD4814; border: 3px solid #DD4814;
background-color: #D7D7D7; background-color: #D7D7D7;
border-radius: 5px;
} }
.user-edit-link { .user-edit-link {
...@@ -1326,6 +1350,10 @@ ins { ...@@ -1326,6 +1350,10 @@ ins {
margin-left: 15px; margin-left: 15px;
} }
#searchtags {
margin: 5px;
}
#searchBar { #searchBar {
float: left; float: left;
margin-left: 15px; margin-left: 15px;
...@@ -1406,8 +1434,8 @@ padding: 6px; ...@@ -1406,8 +1434,8 @@ padding: 6px;
margin-bottom: 0; margin-bottom: 0;
} }
.darkred { /*Quando è un figlio di notify lo facciamo bianco, (è usato da altre parti?)*/ .darkred { /*Quando è un figlio di notify lo facciamo bianco, altrimenti lo convertiamo in arancio per i titoletti*/
color: darkred; color: #DD4818;
} }
.notify > .darkred { .notify > .darkred {
color: white; color: white;
...@@ -2179,13 +2207,14 @@ div.wmd-button-bar { ...@@ -2179,13 +2207,14 @@ div.wmd-button-bar {
#error { #error {
text-align: center; text-align: center;
margin: 5px;
} }
#error-box1, #error-box2, #error-box3 { .error-box {
float: left; float: left;
margin-left: auto; margin-left: auto;
margin-right: auto; margin-right: auto;
width: 33%; width: 32%;
text-align: center; text-align: center;
height: 66px; height: 66px;
padding-top: 44px; padding-top: 44px;
......
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
{% block page_center %} {% block page_center %}
{% block full_width_banner %}{% endblock %} {% block full_width_banner %}{% endblock %}
<div id="wrapper"> <div id="wrapper">
{% block site_width_banner %}{% endblock %} {% block site_width_banner %}{% endblock %}
......
...@@ -61,11 +61,11 @@ ...@@ -61,11 +61,11 @@
<div class="clear"></div> <div class="clear"></div>
</div>
</div>
{% if settings.USE_ANNOUNCEMENT_BAR|or_preview:request %} {% if settings.USE_ANNOUNCEMENT_BAR|or_preview:request %}
<div id="announcement"> <div id="announcement">
{{ settings.ANNOUNCEMENT_BAR|or_preview:request|static_content:settings.ANNOUNCEMENT_BAR_RENDER_MODE }} {{ settings.ANNOUNCEMENT_BAR|or_preview:request|static_content:settings.ANNOUNCEMENT_BAR_RENDER_MODE }}
</div> </div>
{% endif %} {% endif %}
</div>
</div>
<!-- end template header.html --> <!-- end template header.html -->
...@@ -6,13 +6,13 @@ ...@@ -6,13 +6,13 @@
<div class="boxC"> <div class="boxC">
<div class="questions-count"> <div class="questions-count">
{{ questions.paginator.count }}<span style="color:black;font-size:14px;margin-left:5px">{{ list_description }}</span> {{ questions.paginator.count }}<span style="color:#EEE;font-size:14px;margin-left:5px;text-shadow: 1px 1px 1px #222;">{{ list_description }}</span>
</div> </div>
{% if answer_count %} {% if answer_count %}
<div class="questions-count"> <div class="questions-count">
{{ answer_count }}<span style="color:black;font-size:14px;margin-left:5px">{% trans "answers" %}</span> {{ answer_count }}<span style="color:#EEE;font-size:14px;margin-left:5px;text-shadow: 1px 1px 1px #222;">{% trans "answers" %}</span>
</div> </div>
{% endif %} {% endif %}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment