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 {
margin: auto;
min-width: 985px;
margin: 0 20px;
background-color: #FFF;
}
#announcement {
padding: 0 5px;
}
#fixed-header {
height: 120px;
text-align: center;
margin: 5px 20px;
height: 35px;
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 {
......@@ -264,6 +269,10 @@ blockquote blockquote {
text-decoration: none;
}
#fixed-header {
height: 105px;
}
#page-header { display: none; }
#page-body {
overflow: hidden;
......@@ -403,24 +412,38 @@ padding-top: 4px;
padding: 5px;
}
#room {
border: 1px solid #DD4814;
background-color: #E7E7E7;
padding: 5px;
}
#CALeft {
float: left;
width: 84%;
background-color: #e4e4e4;
padding: 5px;
border: solid 1px #D4D4D4;
border-radius: 3px;
}
#CARight {
float: right;
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 {
float: left;
background-color: #e4e4e4;
border: solid 1px #D4D4D4;
border-radius: 3px;
width: 100%;
}
......@@ -525,7 +548,7 @@ padding-top: 4px;
}
.questions-count {
color: #A40000;
color: #DD4818;
font-family: sans-serif;
font-size: 24px;
font-weight: 600;
......@@ -562,12 +585,16 @@ padding-top: 4px;
}
.boxC {
background-color: #D7D7D7;
border-left: 1px solid #DD4814;
border-bottom: 1px solid #DD4814;
padding: 10px;
margin-right: -5px;
margin-top: -5px;
padding-left: 10px;
padding-right: 10px;
padding-bottom: 5px;
padding-top: 5px;
margin-left: 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 {
......@@ -669,8 +696,6 @@ padding-top: 4px;
.tags a, span.tag, .tags-summary a {
background-color: #EEEEEE;
border-bottom: 1px solid #CCCCCC;
border-right: 1px solid #CCCCCC;
color: #777777;
font-size: 11px;
font-weight: normal;
......@@ -697,8 +722,7 @@ padding-top: 4px;
.medal {
background: none repeat scroll 0 0 #DD4818;
border: #DD4818 solid 1px;
color: #333333;
color: white;
font-size: 14px;
font-weight: bold;
line-height: 250%;
......@@ -713,7 +737,6 @@ a.medal {
a.medal:hover {
/*background: url("../images/medala_on.gif") no-repeat scroll 0 0 transparent;*/
background-color: white;
border: #DD4818 solid 1px;
color: #DD4818;
text-decoration: none;
}
......@@ -721,7 +744,7 @@ a.medal:hover {
.tabBar {
clear: both;
height: 30px;
margin-bottom: 3px;
margin: 3px;
width: 100%;
}
......@@ -838,7 +861,7 @@ a.medal:hover {
.questions-related {
font-weight: 700;
word-wrap: break-word;
/*word-wrap: break-word;*/
}
.questions-related p {
......@@ -953,7 +976,7 @@ div.question-body p, div.answer-body p {
margin: 0;
}
.badge-list a {
/*.badge-list a {
color: #DD4818;
}
......@@ -963,7 +986,7 @@ div.question-body p, div.answer-body p {
.badge-list a.medal:hover {
color: #DD4818;
}
}*/
#medalList .badgeListDescription {
float: left;
......@@ -1175,6 +1198,7 @@ ins {
width: 90%;
border: 3px solid #DD4814;
background-color: #D7D7D7;
border-radius: 5px;
}
.user-edit-link {
......@@ -1326,6 +1350,10 @@ ins {
margin-left: 15px;
}
#searchtags {
margin: 5px;
}
#searchBar {
float: left;
margin-left: 15px;
......@@ -1406,8 +1434,8 @@ padding: 6px;
margin-bottom: 0;
}
.darkred { /*Quando è un figlio di notify lo facciamo bianco, (è usato da altre parti?)*/
color: darkred;
.darkred { /*Quando è un figlio di notify lo facciamo bianco, altrimenti lo convertiamo in arancio per i titoletti*/
color: #DD4818;
}
.notify > .darkred {
color: white;
......@@ -2179,13 +2207,14 @@ div.wmd-button-bar {
#error {
text-align: center;
margin: 5px;
}
#error-box1, #error-box2, #error-box3 {
.error-box {
float: left;
margin-left: auto;
margin-right: auto;
width: 33%;
width: 32%;
text-align: center;
height: 66px;
padding-top: 44px;
......
......@@ -2,7 +2,6 @@
{% block page_center %}
{% block full_width_banner %}{% endblock %}
<div id="wrapper">
{% block site_width_banner %}{% endblock %}
......
......@@ -61,11 +61,11 @@
<div class="clear"></div>
</div>
</div>
{% if settings.USE_ANNOUNCEMENT_BAR|or_preview:request %}
<div id="announcement">
{{ settings.ANNOUNCEMENT_BAR|or_preview:request|static_content:settings.ANNOUNCEMENT_BAR_RENDER_MODE }}
</div>
{% endif %}
</div>
</div>
<!-- end template header.html -->
......@@ -6,13 +6,13 @@
<div class="boxC">
<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>
{% if answer_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>
{% 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