Merge lp:~rpadovani/ubuntu-it-ask/pietro into lp:~ubuntu-it-ask/ubuntu-it-ask/dev

[Pietro Albini]

[Giuseppe Terrasi (giuseppeterrasi-deactivatedaccount)]

Necessario sistemare badge.html. float:left, almeno in google-chrome, provoca un errato incolonnamento dell'elenco degli utenti.

review: Needs Fixing

[Giuseppe Terrasi (giuseppeterrasi-deactivatedaccount)]

Sistemato e mergiato in rev 54 ramo dev.

review: Approve

=== added file 'forum/skins/light/media/images/light/icon-search-hover.png'
Binary files forum/skins/light/media/images/light/icon-search-hover.png	1970-01-01 00:00:00 +0000 and forum/skins/light/media/images/light/icon-search-hover.png	2012-07-24 17:15:23 +0000 differ
=== added file 'forum/skins/light/media/images/light/icon-search.png'
Binary files forum/skins/light/media/images/light/icon-search.png	1970-01-01 00:00:00 +0000 and forum/skins/light/media/images/light/icon-search.png	2012-07-24 17:15:23 +0000 differ
=== modified file 'forum/skins/light/media/style/style.css'
--- forum/skins/light/media/style/style.css	2012-07-22 09:40:04 +0000
+++ forum/skins/light/media/style/style.css	2012-07-24 17:15:23 +0000
@@ -201,12 +201,12 @@
     margin: 5px 20px;
     height: 35px;
     font-size: 17px;
-    background: none repeat scroll 0 0 rgba(0, 0, 0, 0.6);
+    background: #D7D7D7;
     border-radius: 5px 5px 5px 5px;
     -moz-border-radius: 5px 5px 5px 5px;
     -webkit-border-radius: 5px 5px 5px;
     line-height: 2;
-    color: white;
+    color: black;
 }
 
 .container {
@@ -414,7 +414,7 @@
 
 #CALeft {
     float: left;
-    width: 84%;
+    width: 83.5%;
     background-color: #e4e4e4;
     padding: 5px;
     border: solid 1px #D4D4D4;
@@ -424,15 +424,11 @@
 #CARight {
     float: right;
     width: 15%;
-    color: #EEE;
 }
 
 #CARight h3 {
-    background-color: transparent;
-    font-size: 20px;
+    font-size: 18px;
     text-align: center;
-    color: #E0E0E0;
-    text-shadow: 1px 1px 1px #222;
 }
 
 #CARight p {
@@ -591,7 +587,7 @@
     padding-top: 5px;
     margin-left: 5px;
     margin-bottom: 10px;
-    background: none repeat scroll 0 0 rgba(0, 0, 0, 0.6);
+    background: #D7D7D7;
     border-radius: 5px 5px 5px 5px;
     -moz-border-radius: 5px 5px 5px 5px;
     -webkit-border-radius: 5px 5px 5px;
@@ -633,6 +629,9 @@
     color: #777777;
     font: bold 100% sans-serif;
     padding: 2px 4px 3px;
+    border-radius: 3px;
+    -moz-border-radius: 3px;
+    -webkit-border-radius: 3px;
 }
 
 .paginator .prev {
@@ -1383,22 +1382,42 @@
 }
 
 #searchBar .searchInput {
-    border: 3px solid #D7D7D7;
-    padding: 3px;
-    font-size: 13px;
-    height: 18px;
-    width: 380px;
+    border: 1px solid #D7D7D7;
+    padding: 3px;
+    font-size: 13px;
+    height: 18px;
+    width: 380px;
+}
+
+#searchBar .searchInputGrey {
+    border: 1px solid #D7D7D7;
+    padding: 3px;
+    font-size: 13px;
+    height: 18px;
+    width: 380px;
+    color: #E7E7E7;
+    font-style: italic;
 }
 
 #searchBar .searchInput:focus {
-    border: 3px solid #DD4818;
-    outline: none;
+    outline: medium none;
+	border: 1px solid #DD4818;
 }
 
 #searchBar .searchBtn {
-    font-size: 14px;
-    height: 26px;
-    width: 80px;
+    background-color: inherit;
+    background-image: url(../images/light/icon-search.png);
+    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 {
@@ -1447,6 +1466,10 @@
     border: 1px solid #DD4814;
     margin: 10px 0;
     padding: 5px;
+    border-radius: 4px;
+    -webkit-border-radius: 4px;
+    -moz-border-radius: 4px;
+    -khtml-border-radius: 4px;
 }
 
 .message p {
@@ -1462,16 +1485,21 @@
 
 .submit {
     background-color: white;
-    border: 2px solid #DD4814;
-    cursor: pointer;
-    font-size: 120%;
-    font-weight: bold;
-    height: 40px;
-    padding-bottom: 4px;
+	border: 1px solid rgb(221, 72, 20);
+	cursor: pointer;
+	font-size: 120%;
+	font-weight: bold;
+	height: 30px;
+	border-radius: 4px;
+	-webkit-border-radius: 4px;
+    -moz-border-radius: 4px;
+    -khtml-border-radius: 4px;
 }
 
 .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 {
@@ -2225,8 +2253,9 @@
 }
 
 #error > h1 {
-    color: white;
-    background-color: #DD4818;
+    color: #ffffff;
+	background-color: rgb(221, 72, 24);
+	border-radius: 4px;
 }
 
 #error {

=== modified file 'forum/skins/light/media/style/user.css'
--- forum/skins/light/media/style/user.css	2012-07-11 13:07:08 +0000
+++ forum/skins/light/media/style/user.css	2012-07-24 17:15:23 +0000
@@ -14,8 +14,9 @@
 #user-menu-dropdown {
     position: absolute;
     background-color: #EEEEEE;
-    -moz-border-radius: 5px;
-    -webkit-border-radius: 5px;
+    border: 1px solid rgb(221, 72, 20);
+    -moz-border-radius: 4px 0 4px 4px;
+    -webkit-border-radius: 4px 0 4px 4px;
     -moz-box-shadow: 2px 2px 5px #DD4818;
     -webkit-box-shadow: 2px 2px 5px #DD4818;
 }

=== modified file 'forum/skins/light/templates/badge.html'
--- forum/skins/light/templates/badge.html	2012-07-11 13:07:08 +0000
+++ forum/skins/light/templates/badge.html	2012-07-24 17:15:23 +0000
@@ -30,7 +30,7 @@
     </div>
     <div id="award-list" style="clear:both;margin-left:20px;line-height:25px;">
         {% 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">{% user_signature award.user "badges" %}<span class="tag-number"> &#215; {{ award.count|intcomma }}</span></p><br/>
         {% endfor %}
     </div>
 </div>

=== modified file 'forum/skins/light/templates/header.html'
--- forum/skins/light/templates/header.html	2012-07-20 11:08:25 +0000
+++ forum/skins/light/templates/header.html	2012-07-24 17:15:23 +0000
@@ -48,7 +48,7 @@
                         
                         <div id="sub_header_search">
                             <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>
                     </form>	
                 </div>

=== modified file 'forum/skins/light/templates/question_list/count.html'
--- forum/skins/light/templates/question_list/count.html	2012-07-20 11:08:25 +0000
+++ forum/skins/light/templates/question_list/count.html	2012-07-24 17:15:23 +0000
@@ -5,22 +5,19 @@
 {% enddeclare %}
 
 <div class="boxC">
+    <h3>{{ questions.paginator.sort_description }}</h3>
+
     <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>
 
 
     {% if answer_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>
 
     {% endif %}
 
-    <div>
-        <p class="nomargin">
-            {{ questions.paginator.sort_description }}
-        </p>
-    </div>
 </div>
 {% endspaceless %}