Commit 4498dc30 authored by Giuseppe Terrasi's avatar Giuseppe Terrasi

- Fix bug #1028318
- Re-style search bar and sidebar
- change sort order in bagde.html
- Minor changes
Thanks to Riccado Padovani and Pietro Albini
parents 4b9a81f4 4c612eb7
...@@ -201,12 +201,12 @@ blockquote blockquote { ...@@ -201,12 +201,12 @@ blockquote blockquote {
margin: 5px 20px; margin: 5px 20px;
height: 35px; height: 35px;
font-size: 17px; font-size: 17px;
background: none repeat scroll 0 0 rgba(0, 0, 0, 0.6); background: #D7D7D7;
border-radius: 5px 5px 5px 5px; border-radius: 5px 5px 5px 5px;
-moz-border-radius: 5px 5px 5px 5px; -moz-border-radius: 5px 5px 5px 5px;
-webkit-border-radius: 5px 5px 5px; -webkit-border-radius: 5px 5px 5px;
line-height: 2; line-height: 2;
color: white; color: black;
} }
.container { .container {
...@@ -414,7 +414,7 @@ padding-top: 4px; ...@@ -414,7 +414,7 @@ padding-top: 4px;
#CALeft { #CALeft {
float: left; float: left;
width: 84%; width: 83.5%;
background-color: #e4e4e4; background-color: #e4e4e4;
padding: 5px; padding: 5px;
border: solid 1px #D4D4D4; border: solid 1px #D4D4D4;
...@@ -424,15 +424,11 @@ padding-top: 4px; ...@@ -424,15 +424,11 @@ padding-top: 4px;
#CARight { #CARight {
float: right; float: right;
width: 15%; width: 15%;
color: #EEE;
} }
#CARight h3 { #CARight h3 {
background-color: transparent; font-size: 18px;
font-size: 20px;
text-align: center; text-align: center;
color: #E0E0E0;
text-shadow: 1px 1px 1px #222;
} }
#CARight p { #CARight p {
...@@ -591,7 +587,7 @@ padding-top: 4px; ...@@ -591,7 +587,7 @@ padding-top: 4px;
padding-top: 5px; padding-top: 5px;
margin-left: 5px; margin-left: 5px;
margin-bottom: 10px; margin-bottom: 10px;
background: none repeat scroll 0 0 rgba(0, 0, 0, 0.6); background: #D7D7D7;
border-radius: 5px 5px 5px 5px; border-radius: 5px 5px 5px 5px;
-moz-border-radius: 5px 5px 5px 5px; -moz-border-radius: 5px 5px 5px 5px;
-webkit-border-radius: 5px 5px 5px; -webkit-border-radius: 5px 5px 5px;
...@@ -633,6 +629,9 @@ padding-top: 4px; ...@@ -633,6 +629,9 @@ padding-top: 4px;
color: #777777; color: #777777;
font: bold 100% sans-serif; font: bold 100% sans-serif;
padding: 2px 4px 3px; padding: 2px 4px 3px;
border-radius: 3px;
-moz-border-radius: 3px;
-webkit-border-radius: 3px;
} }
.paginator .prev { .paginator .prev {
...@@ -1383,22 +1382,42 @@ ins { ...@@ -1383,22 +1382,42 @@ ins {
} }
#searchBar .searchInput { #searchBar .searchInput {
border: 3px solid #D7D7D7; border: 1px solid #D7D7D7;
padding: 3px;
font-size: 13px;
height: 18px;
width: 380px;
}
#searchBar .searchInputGrey {
border: 1px solid #D7D7D7;
padding: 3px; padding: 3px;
font-size: 13px; font-size: 13px;
height: 18px; height: 18px;
width: 380px; width: 380px;
color: #E7E7E7;
font-style: italic;
} }
#searchBar .searchInput:focus { #searchBar .searchInput:focus {
border: 3px solid #DD4818; outline: medium none;
outline: none; border: 1px solid #DD4818;
} }
#searchBar .searchBtn { #searchBar .searchBtn {
font-size: 14px; background-color: inherit;
height: 26px; background-image: url(../images/light/icon-search.png);
width: 80px; vertical-align: middle;
cursor: pointer;
width: 22px;
height: 22px;
background-repeat: no-repeat;
background-position: center;
border-style: none;
}
#searchBar .searchBtn:hover {
background-image: url(../images/light/icon-search-hover.png);
} }
#searchBar .options { #searchBar .options {
...@@ -1447,6 +1466,10 @@ padding: 6px; ...@@ -1447,6 +1466,10 @@ padding: 6px;
border: 1px solid #DD4814; border: 1px solid #DD4814;
margin: 10px 0; margin: 10px 0;
padding: 5px; padding: 5px;
border-radius: 4px;
-webkit-border-radius: 4px;
-moz-border-radius: 4px;
-khtml-border-radius: 4px;
} }
.message p { .message p {
...@@ -1462,16 +1485,21 @@ padding: 6px; ...@@ -1462,16 +1485,21 @@ padding: 6px;
.submit { .submit {
background-color: white; background-color: white;
border: 2px solid #DD4814; border: 1px solid rgb(221, 72, 20);
cursor: pointer; cursor: pointer;
font-size: 120%; font-size: 120%;
font-weight: bold; font-weight: bold;
height: 40px; height: 30px;
padding-bottom: 4px; border-radius: 4px;
-webkit-border-radius: 4px;
-moz-border-radius: 4px;
-khtml-border-radius: 4px;
} }
.submit:hover { .submit:hover {
text-decoration: underline; background: none repeat scroll 0% 0% rgb(221, 72, 20);
color: rgb(255, 255, 255);
text-decoration: none;
} }
.ask-body { .ask-body {
...@@ -2225,8 +2253,9 @@ div.wmd-button-bar { ...@@ -2225,8 +2253,9 @@ div.wmd-button-bar {
} }
#error > h1 { #error > h1 {
color: white; color: #ffffff;
background-color: #DD4818; background-color: rgb(221, 72, 24);
border-radius: 4px;
} }
#error { #error {
......
...@@ -14,8 +14,9 @@ ...@@ -14,8 +14,9 @@
#user-menu-dropdown { #user-menu-dropdown {
position: absolute; position: absolute;
background-color: #EEEEEE; background-color: #EEEEEE;
-moz-border-radius: 5px; border: 1px solid rgb(221, 72, 20);
-webkit-border-radius: 5px; -moz-border-radius: 4px 0 4px 4px;
-webkit-border-radius: 4px 0 4px 4px;
-moz-box-shadow: 2px 2px 5px #DD4818; -moz-box-shadow: 2px 2px 5px #DD4818;
-webkit-box-shadow: 2px 2px 5px #DD4818; -webkit-box-shadow: 2px 2px 5px #DD4818;
} }
......
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
</div> </div>
<div id="award-list" style="clear:both;margin-left:20px;line-height:25px;"> <div id="award-list" style="clear:both;margin-left:20px;line-height:25px;">
{% for award in awards %} {% for award in awards %}
<p style="width:220px;float:left">{% user_signature award.user "badges" %}<span class="tag-number"> &#215; {{ award.count|intcomma }}</span></p> <p style="width:250px;float:left;margin-bottom:5px;">{% user_signature award.user "badges" %}<span class="tag-number"> &#215; {{ award.count|intcomma }}</span></p><br/>
{% endfor %} {% endfor %}
</div> </div>
</div> </div>
......
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
<div id="sub_header_search"> <div id="sub_header_search">
<input type="text" class="searchInput" value="{{ keywords }}" name="q" id="keywords" /> <input type="text" class="searchInput" value="{{ keywords }}" name="q" id="keywords" />
<input type="submit" name="Submit" value="{% trans "search" %}" class="searchBtn" /> <button name="Submit" class="searchBtn" ></button>
</div> </div>
</form> </form>
</div> </div>
......
...@@ -5,22 +5,19 @@ ...@@ -5,22 +5,19 @@
{% enddeclare %} {% enddeclare %}
<div class="boxC"> <div class="boxC">
<h3>{{ questions.paginator.sort_description }}</h3>
<div class="questions-count"> <div class="questions-count">
{{ questions.paginator.count }}<span style="color:#EEE;font-size:14px;margin-left:5px;text-shadow: 1px 1px 1px #222;">{{ list_description }}</span> {{ questions.paginator.count }}<span style="font-size:14px;margin-left:5px;">{{ list_description }}</span>
</div> </div>
{% if answer_count %} {% if answer_count %}
<div class="questions-count"> <div class="questions-count">
{{ answer_count }}<span style="color:#EEE;font-size:14px;margin-left:5px;text-shadow: 1px 1px 1px #222;">{% trans "answers" %}</span> {{ answer_count }}<span style="font-size:14px;margin-left:5px;">{% trans "answers" %}</span>
</div> </div>
{% endif %} {% endif %}
<div>
<p class="nomargin">
{{ questions.paginator.sort_description }}
</p>
</div>
</div> </div>
{% endspaceless %} {% endspaceless %}
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