Ubuntu-it Ask

Merge lp:~rpadovani/ubuntu-it-ask/badges into lp:ubuntu-it-ask

  1. badges
  2. Merge into stable
Proposed by Riccardo Padovani
Status: Merged
Merged at revision: 36
Proposed branch: lp:~rpadovani/ubuntu-it-ask/badges
Merge into: lp:ubuntu-it-ask
Diff against target: 302 lines (+41/-51)
9 files modified
forum/skins/light/media/style/style.css (+30/-36)
forum/skins/light/media/style/user.css (+2/-2)
forum/skins/light/templates/badge.html (+3/-2)
forum/skins/light/templates/badges.html (+2/-2)
forum/skins/light/templates/base_content.html (+1/-1)
forum/skins/light/templates/user.html (+0/-5)
forum/skins/light/templates/users/edit.html (+1/-1)
forum/skins/light/templates/users/info.html (+1/-1)
forum/skins/light/templates/users/users.html (+1/-1)
To merge this branch: bzr merge lp:~rpadovani/ubuntu-it-ask/badges
Reviewer Review Type Date Requested Status
Giuseppe Terrasi (community) Approve
Review via email: mp+114590@code.launchpad.net

Description of the change

Aggiornati alla nuova grafica le pagine che riguardano i badge.

To post a comment you must log in.
Revision history for this message
Giuseppe Terrasi (giuseppeterrasi-deactivatedaccount) wrote :

Trattandosi di una proposta di merge cha abbiamo avuto modo di guardare sul sito di prova, provvedo ad includerlo nel branch principale.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file 'forum/skins/light/media/images/openid/launchpad.png'
2Binary files forum/skins/light/media/images/openid/launchpad.png 1970-01-01 00:00:00 +0000 and forum/skins/light/media/images/openid/launchpad.png 2012-07-12 09:13:25 +0000 differ
3=== removed file 'forum/skins/light/media/images/openid/launchpad.png'
4Binary files forum/skins/light/media/images/openid/launchpad.png 2012-07-03 19:59:31 +0000 and forum/skins/light/media/images/openid/launchpad.png 1970-01-01 00:00:00 +0000 differ
5=== added file 'forum/skins/light/media/images/openid/ubuntusso.png'
6Binary files forum/skins/light/media/images/openid/ubuntusso.png 1970-01-01 00:00:00 +0000 and forum/skins/light/media/images/openid/ubuntusso.png 2012-07-12 09:13:25 +0000 differ
7=== removed file 'forum/skins/light/media/images/openid/ubuntusso.png'
8Binary files forum/skins/light/media/images/openid/ubuntusso.png 2012-07-03 19:59:31 +0000 and forum/skins/light/media/images/openid/ubuntusso.png 1970-01-01 00:00:00 +0000 differ
9=== modified file 'forum/skins/light/media/style/style.css'
10--- forum/skins/light/media/style/style.css 2012-07-09 09:14:45 +0000
11+++ forum/skins/light/media/style/style.css 2012-07-12 09:13:25 +0000
12@@ -87,12 +87,12 @@
13 text-align: right;
14 }
15
16-.spacer3 {
17+/*.spacer3 {
18 clear: both;
19 height: 30px;
20 line-height: 30px;
21 visibility: hidden;
22-}
23+}*/
24
25 h1 {
26 font-size: 160%;
27@@ -407,13 +407,13 @@
28 }
29
30 #room {
31- background-color: #FFFFFF;
32- border-bottom: 1px solid #777777;
33+ border: 1px solid #DD4814;
34+ background-color: #E7E7E7;
35+ padding: 5px;
36 }
37
38 #CALeft {
39 float: left;
40- position: relative;
41 width: 84%;
42 }
43
44@@ -425,8 +425,6 @@
45 #CAFull {
46 float: left;
47 width: 100%;
48- border: 1px solid #DD4814;
49- background-color: #E7E7E7;
50 }
51
52 #ground {
53@@ -566,12 +564,12 @@
54 }
55
56 .boxC {
57- background: none repeat scroll 0 0 #E5EBF8;
58- border-color: #EEEEEC #A9ACA5 #BABDB6 #EEEEEC;
59- border-style: solid;
60- border-width: 1px;
61- margin-bottom: 8px;
62+ background-color: #D7D7D7;
63+ border-left: 1px solid #DD4814;
64+ border-bottom: 1px solid #DD4814;
65 padding: 10px;
66+ margin-right: -5px;
67+ margin-top: -5px;
68 }
69
70 .boxC p {
71@@ -688,11 +686,8 @@
72 }
73
74 .medal {
75- background: none repeat scroll 0 0 #FFFFCD;
76- border-color: #EEEEEE #CCCCCC #CCCCCC #EEEEEE;
77- border-left: 1px solid #EEEEEE;
78- border-style: solid;
79- border-width: 1px;
80+ background: none repeat scroll 0 0 #DD4818;
81+ border: #DD4818 solid 1px;
82 color: #333333;
83 font-size: 14px;
84 font-weight: bold;
85@@ -702,16 +697,14 @@
86
87 a.medal {
88 text-decoration: none;
89- color: #333333;
90+ color: white;
91 }
92
93 a.medal:hover {
94- background: url("../images/medala_on.gif") no-repeat scroll 0 0 transparent;
95- border-color: #E7E296 #D1CA3D #D1CA3D #E7E296;
96- border-left: 1px solid #E7E296;
97- border-style: solid;
98- border-width: 1px;
99- color: #333333;
100+ /*background: url("../images/medala_on.gif") no-repeat scroll 0 0 transparent;*/
101+ background-color: white;
102+ border: #DD4818 solid 1px;
103+ color: #DD4818;
104 text-decoration: none;
105 }
106
107@@ -765,7 +758,7 @@
108 }
109
110 .tabsA a:hover {
111- background: none repeat scroll 0 0 #356FCB;
112+ background: none repeat scroll 0 0 #DD4818;
113 color: #FFFFFF;
114 }
115
116@@ -939,11 +932,15 @@
117 }
118
119 .badge-list a {
120- color: #3060A8;
121+ color: #DD4818;
122 }
123
124 .badge-list a.medal {
125- color: #333333;
126+ color: white;
127+}
128+
129+.badge-list a.medal:hover {
130+ color: #DD4818;
131 }
132
133 #medalList .badgeListDescription {
134@@ -1282,16 +1279,13 @@
135 margin-left: 0px;
136 }
137
138-#subheader .silver, .badge2 {
139- float: left;
140+#top .bronze, .badge3, #top .silver, .badge2 {
141 line-height: 40px;
142 margin-left: 0px;
143 }
144
145-#subheader .bronze, .badge3 {
146+#top .bronze, #top .silver {
147 float: left;
148- line-height: 40px;
149- margin-left: 0px;
150 }
151
152 #subheader .badgecount {
153@@ -1931,8 +1925,8 @@
154 background-color: #EEEEEE;
155 -moz-border-radius: 5px;
156 -webkit-border-radius: 5px;
157- -moz-box-shadow: 2px 2px 5px #3060A8;
158- -webkit-box-shadow: 2px 2px 5px #3060A8;
159+ -moz-box-shadow: 2px 2px 5px #DD4818;
160+ -webkit-box-shadow: 2px 2px 5px #DD4818;
161 }
162
163 .context-menu-dropdown {
164@@ -1964,7 +1958,7 @@
165 }
166
167 .context-menu-dropdown li.item:hover {
168- background-color: #3060A8;
169+ background-color: #DD4818;
170 color: white;
171 }
172
173@@ -1999,7 +1993,7 @@
174 margin: 0 3px 5px 3px;
175 -moz-border-radius: 3px;
176 -webkit-border-radius: 3px;
177- background-color: #3060A8;
178+ background-color: #DD4818;
179 color: white;
180 line-height: 20px;
181 vertical-align: baseline;
182
183=== modified file 'forum/skins/light/media/style/user.css'
184--- forum/skins/light/media/style/user.css 2012-07-09 09:14:45 +0000
185+++ forum/skins/light/media/style/user.css 2012-07-12 09:13:25 +0000
186@@ -16,8 +16,8 @@
187 background-color: #EEEEEE;
188 -moz-border-radius: 5px;
189 -webkit-border-radius: 5px;
190- -moz-box-shadow: 2px 2px 5px #3060A8;
191- -webkit-box-shadow: 2px 2px 5px #3060A8;
192+ -moz-box-shadow: 2px 2px 5px #DD4818;
193+ -webkit-box-shadow: 2px 2px 5px #DD4818;
194 }
195
196 div.dialog.award-rep-points table {
197
198=== modified file 'forum/skins/light/templates/badge.html'
199--- forum/skins/light/templates/badge.html 2012-07-02 19:36:31 +0000
200+++ forum/skins/light/templates/badge.html 2012-07-12 09:13:25 +0000
201@@ -14,7 +14,8 @@
202 </script>
203 {% endblock %}
204 {% block content %}
205-<div id="main-bar" class="headNormal">
206+<div id="mainbar-full">
207+<div class="headUser">
208 {% trans "Badge" %}
209 </div>
210 <div id="main-body" style="width:100%;margin-bottom:20px">
211@@ -32,7 +33,7 @@
212 <p style="width:220px;float:left">{% user_signature award.user "badges" %}<span class="tag-number"> &#215; {{ award.count|intcomma }}</span></p>
213 {% endfor %}
214 </div>
215-
216+</div>
217 </div>
218 {% endblock %}
219 <!-- end template badge.html -->
220
221=== modified file 'forum/skins/light/templates/badges.html'
222--- forum/skins/light/templates/badges.html 2012-07-02 19:36:31 +0000
223+++ forum/skins/light/templates/badges.html 2012-07-12 09:13:25 +0000
224@@ -5,8 +5,8 @@
225 {% load i18n %}
226 {% block title %}{% spaceless %}{% trans "Badges summary" %}{% endspaceless %}{% endblock %}
227 {% block content %}
228-<div class="headlineA">
229- <span class="headMedals">{% trans "Badges" %}</span>
230+<div class="headUser">
231+ {% trans "Badges" %}
232 </div>
233 <div class="badges" id="main-body" style="width:100%">
234 <p>
235
236=== modified file 'forum/skins/light/templates/base_content.html'
237--- forum/skins/light/templates/base_content.html 2012-07-04 17:59:50 +0000
238+++ forum/skins/light/templates/base_content.html 2012-07-12 09:13:25 +0000
239@@ -95,7 +95,7 @@
240 {% endblock %}
241 </div>
242 </div>
243- <div class="spacer3"></div>
244+ <!--<div class="spacer3"></div>-->
245 </div>
246 {% endblock %}
247 {% if settings.USE_CUSTOM_FOOTER|or_preview:request %}
248
249=== modified file 'forum/skins/light/templates/user.html'
250--- forum/skins/light/templates/user.html 2012-07-02 19:36:31 +0000
251+++ forum/skins/light/templates/user.html 2012-07-12 09:13:25 +0000
252@@ -26,11 +26,6 @@
253 <link rel="stylesheet" href="http://static.jquery.com/ui/css/demo-docs-theme/ui.theme.css" type="text/css" media="all" />
254 <link rel="stylesheet" type="text/css" media="screen" href="{% media "/media/style/user.css" %}"/>
255 {% endif %}
256- <style type="text/css">
257- #room {
258- border: 0;
259- }
260- </style>
261 {% block userjs %}{% endblock %}
262 {% endblock %}
263 {% block content %}
264
265=== modified file 'forum/skins/light/templates/users/edit.html'
266--- forum/skins/light/templates/users/edit.html 2012-07-09 09:14:45 +0000
267+++ forum/skins/light/templates/users/edit.html 2012-07-12 09:13:25 +0000
268@@ -30,7 +30,7 @@
269 {% endblock %}
270 {% block content %}
271 <div id="mainbar-full">
272-<div id="subheader" class="headUser">
273+<div class="headUser">
274 {{ user.username }} - {% trans "edit profile" %}
275 </div>
276 <div id="main-body" style="width:100%">
277
278=== modified file 'forum/skins/light/templates/users/info.html'
279--- forum/skins/light/templates/users/info.html 2012-07-09 09:14:45 +0000
280+++ forum/skins/light/templates/users/info.html 2012-07-12 09:13:25 +0000
281@@ -7,7 +7,7 @@
282 {% load markup %}
283 {% load user_tags %}
284
285-<div id="subheader" class="headUser{% if view_user.is_suspended %} suspended-user{% endif %}">
286+<div class="headUser{% if view_user.is_suspended %} suspended-user{% endif %}">
287 {{view_user.decorated_name}}
288 </div>
289 <table class="user-info-table" width="100%">
290
291=== modified file 'forum/skins/light/templates/users/users.html'
292--- forum/skins/light/templates/users/users.html 2012-07-02 19:36:31 +0000
293+++ forum/skins/light/templates/users/users.html 2012-07-12 09:13:25 +0000
294@@ -20,7 +20,7 @@
295 {% endblock %}
296 {% block content %}
297 <div class="tabBar">
298- <div class="headUsers">{% trans "Users" %}</div>
299+ <div class="headUser">{% trans "Users" %}</div>
300 {{ users.paginator.sort_tabs }}
301 </div>
302 <div id="main-body" style="width:100%">

Subscribers

People subscribed via source and target branches