Ubuntu-it Ask

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

  1. icon
  2. Merge into dev
Proposed by Giuseppe Terrasi
Status: Merged
Merged at revision: 69
Proposed branch: lp:~rpadovani/ubuntu-it-ask/icon
Merge into: lp:~ubuntu-it-ask/ubuntu-it-ask/dev
Diff against target: 237 lines (+44/-65)
1 file modified
forum/skins/light/media/style/style.css (+44/-65)
To merge this branch: bzr merge lp:~rpadovani/ubuntu-it-ask/icon
Reviewer Review Type Date Requested Status
Ubuntu-it Ask Pending
Review via email: mp+127140@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== removed file 'forum/skins/light/media/images/badges.png'
2Binary files forum/skins/light/media/images/badges.png 2012-09-24 12:05:27 +0000 and forum/skins/light/media/images/badges.png 1970-01-01 00:00:00 +0000 differ
3=== removed file 'forum/skins/light/media/images/blue-up-arrow-h18px.png'
4Binary files forum/skins/light/media/images/blue-up-arrow-h18px.png 2012-07-02 19:36:31 +0000 and forum/skins/light/media/images/blue-up-arrow-h18px.png 1970-01-01 00:00:00 +0000 differ
5=== removed file 'forum/skins/light/media/images/close-small-dark.png'
6Binary files forum/skins/light/media/images/close-small-dark.png 2012-07-02 19:36:31 +0000 and forum/skins/light/media/images/close-small-dark.png 1970-01-01 00:00:00 +0000 differ
7=== removed file 'forum/skins/light/media/images/close-small-hover.png'
8Binary files forum/skins/light/media/images/close-small-hover.png 2012-07-02 19:36:31 +0000 and forum/skins/light/media/images/close-small-hover.png 1970-01-01 00:00:00 +0000 differ
9=== removed file 'forum/skins/light/media/images/close-small.png'
10Binary files forum/skins/light/media/images/close-small.png 2012-07-02 19:36:31 +0000 and forum/skins/light/media/images/close-small.png 1970-01-01 00:00:00 +0000 differ
11=== removed file 'forum/skins/light/media/images/comment-delete-hover.png'
12Binary files forum/skins/light/media/images/comment-delete-hover.png 2012-07-02 19:36:31 +0000 and forum/skins/light/media/images/comment-delete-hover.png 1970-01-01 00:00:00 +0000 differ
13=== removed file 'forum/skins/light/media/images/comment-delete.png'
14Binary files forum/skins/light/media/images/comment-delete.png 2012-07-02 19:36:31 +0000 and forum/skins/light/media/images/comment-delete.png 1970-01-01 00:00:00 +0000 differ
15=== removed file 'forum/skins/light/media/images/comment-edit-hover.png'
16Binary files forum/skins/light/media/images/comment-edit-hover.png 2012-07-02 19:36:31 +0000 and forum/skins/light/media/images/comment-edit-hover.png 1970-01-01 00:00:00 +0000 differ
17=== removed file 'forum/skins/light/media/images/comment-edit.png'
18Binary files forum/skins/light/media/images/comment-edit.png 2012-07-02 19:36:31 +0000 and forum/skins/light/media/images/comment-edit.png 1970-01-01 00:00:00 +0000 differ
19=== removed file 'forum/skins/light/media/images/comment-like-on.png'
20Binary files forum/skins/light/media/images/comment-like-on.png 2012-07-02 19:36:31 +0000 and forum/skins/light/media/images/comment-like-on.png 1970-01-01 00:00:00 +0000 differ
21=== removed file 'forum/skins/light/media/images/comment-like.png'
22Binary files forum/skins/light/media/images/comment-like.png 2012-07-02 19:36:31 +0000 and forum/skins/light/media/images/comment-like.png 1970-01-01 00:00:00 +0000 differ
23=== removed file 'forum/skins/light/media/images/convert-hover.png'
24Binary files forum/skins/light/media/images/convert-hover.png 2012-07-02 19:36:31 +0000 and forum/skins/light/media/images/convert-hover.png 1970-01-01 00:00:00 +0000 differ
25=== removed file 'forum/skins/light/media/images/convert-off.png'
26Binary files forum/skins/light/media/images/convert-off.png 2012-07-02 19:36:31 +0000 and forum/skins/light/media/images/convert-off.png 1970-01-01 00:00:00 +0000 differ
27=== removed file 'forum/skins/light/media/images/convert-to-question-hover.png'
28Binary files forum/skins/light/media/images/convert-to-question-hover.png 2012-07-02 19:36:31 +0000 and forum/skins/light/media/images/convert-to-question-hover.png 1970-01-01 00:00:00 +0000 differ
29=== removed file 'forum/skins/light/media/images/convert-to-question-off.png'
30Binary files forum/skins/light/media/images/convert-to-question-off.png 2012-07-02 19:36:31 +0000 and forum/skins/light/media/images/convert-to-question-off.png 1970-01-01 00:00:00 +0000 differ
31=== removed file 'forum/skins/light/media/images/edit.png'
32Binary files forum/skins/light/media/images/edit.png 2012-07-02 19:36:31 +0000 and forum/skins/light/media/images/edit.png 1970-01-01 00:00:00 +0000 differ
33=== removed file 'forum/skins/light/media/images/gray-up-arrow-h18px.png'
34Binary files forum/skins/light/media/images/gray-up-arrow-h18px.png 2012-07-02 19:36:31 +0000 and forum/skins/light/media/images/gray-up-arrow-h18px.png 1970-01-01 00:00:00 +0000 differ
35=== removed file 'forum/skins/light/media/images/grippie.png'
36Binary files forum/skins/light/media/images/grippie.png 2012-07-02 19:36:31 +0000 and forum/skins/light/media/images/grippie.png 1970-01-01 00:00:00 +0000 differ
37=== added file 'forum/skins/light/media/images/icon.png'
38Binary files forum/skins/light/media/images/icon.png 1970-01-01 00:00:00 +0000 and forum/skins/light/media/images/icon.png 2012-09-30 06:30:28 +0000 differ
39=== removed file 'forum/skins/light/media/images/vote-accepted-on.png'
40Binary files forum/skins/light/media/images/vote-accepted-on.png 2012-07-02 19:36:31 +0000 and forum/skins/light/media/images/vote-accepted-on.png 1970-01-01 00:00:00 +0000 differ
41=== removed file 'forum/skins/light/media/images/vote-accepted.png'
42Binary files forum/skins/light/media/images/vote-accepted.png 2012-07-02 19:36:31 +0000 and forum/skins/light/media/images/vote-accepted.png 1970-01-01 00:00:00 +0000 differ
43=== removed file 'forum/skins/light/media/images/vote-arrow-down-on.png'
44Binary files forum/skins/light/media/images/vote-arrow-down-on.png 2012-07-02 19:36:31 +0000 and forum/skins/light/media/images/vote-arrow-down-on.png 1970-01-01 00:00:00 +0000 differ
45=== removed file 'forum/skins/light/media/images/vote-arrow-down.png'
46Binary files forum/skins/light/media/images/vote-arrow-down.png 2012-07-02 19:36:31 +0000 and forum/skins/light/media/images/vote-arrow-down.png 1970-01-01 00:00:00 +0000 differ
47=== removed file 'forum/skins/light/media/images/vote-arrow-up-on.png'
48Binary files forum/skins/light/media/images/vote-arrow-up-on.png 2012-07-02 19:36:31 +0000 and forum/skins/light/media/images/vote-arrow-up-on.png 1970-01-01 00:00:00 +0000 differ
49=== removed file 'forum/skins/light/media/images/vote-arrow-up.png'
50Binary files forum/skins/light/media/images/vote-arrow-up.png 2012-07-02 19:36:31 +0000 and forum/skins/light/media/images/vote-arrow-up.png 1970-01-01 00:00:00 +0000 differ
51=== removed file 'forum/skins/light/media/images/vote-favorite-off.png'
52Binary files forum/skins/light/media/images/vote-favorite-off.png 2012-07-02 19:36:31 +0000 and forum/skins/light/media/images/vote-favorite-off.png 1970-01-01 00:00:00 +0000 differ
53=== removed file 'forum/skins/light/media/images/vote-favorite-on.png'
54Binary files forum/skins/light/media/images/vote-favorite-on.png 2012-07-02 19:36:31 +0000 and forum/skins/light/media/images/vote-favorite-on.png 1970-01-01 00:00:00 +0000 differ
55=== modified file 'forum/skins/light/media/style/style.css'
56--- forum/skins/light/media/style/style.css 2012-09-25 15:00:38 +0000
57+++ forum/skins/light/media/style/style.css 2012-09-30 06:30:28 +0000
58@@ -393,7 +393,6 @@
59
60 #top * {
61 line-height: 40px;
62- height: 40px;
63 }
64
65 #top span {
66@@ -790,13 +789,14 @@
67 }
68
69 .medal span, .bronze, .silver, .gold {
70- background: url("../images/badges.png");
71+ background: url("../images/icon.png");
72 text-indent: -10000px;
73 width: 18px;
74- min-height: 17px;
75+ height: 17px;
76 display: inline-block;
77- background-position-y: center;
78+ background-position-y: top;
79 background-repeat: no-repeat;
80+ vertical-align: middle;
81 }
82
83 .badgecount {
84@@ -1274,11 +1274,6 @@
85 -webkit-border-radius: 4px;
86 }
87
88-.user-edit-link {
89- background: url("../images/edit.png") no-repeat scroll 0 0 transparent;
90- padding-left: 20px;
91-}
92-
93 .user-info-table {
94 margin-bottom: 10px;
95 width: 100%;
96@@ -1390,7 +1385,7 @@
97
98 .bronze, .badge3 {
99 color: #CC9933;
100- background-position: -61px !important;
101+ background-position-x: -61px !important;
102 }
103
104 .score, .accept_rate {
105@@ -1775,28 +1770,31 @@
106 width: 24px;
107 }
108
109+/*Icone con hover da 24px*/
110+a.post-vote.up, a.post-vote.down, a.accept-answer, .favorite-mark {
111+ background-image: url("../images/icon.png");
112+ background-repeat: no-repeat;
113+ background-color: transparent;
114+}
115+
116 a.post-vote.up {
117- background: url("../images/vote-arrow-up.png") no-repeat scroll center center transparent;
118-}
119-
120-a.post-vote.up.on, a.post-vote.up:hover {
121- background: url("../images/vote-arrow-up-on.png") no-repeat scroll center center transparent;
122+ background-position-y: -157px;
123 }
124
125 a.post-vote.down {
126- background: url("../images/vote-arrow-down.png") no-repeat scroll center center transparent;
127-}
128-
129-a.post-vote.down.on, a.post-vote.down:hover {
130- background: url("../images/vote-arrow-down-on.png") no-repeat scroll center center transparent;
131+ background-position-y: -132px;
132 }
133
134 a.accept-answer {
135- background: url("../images/vote-accepted.png") no-repeat scroll center center transparent;
136-}
137-
138-a.accept-answer.on, a.accept-answer:hover {
139- background: url("../images/vote-accepted-on.png") no-repeat scroll center center transparent;
140+ background-position-y: -105px;
141+}
142+
143+.favorite-mark {
144+ background-position-y: -185px;
145+}
146+
147+a.post-vote.up.on, a.post-vote.up:hover, a.post-vote.down.on, a.post-vote.down:hover, a.accept-answer.on, a.accept-answer:hover, .favorite-mark.on, a.favorite-mark:hover {
148+ background-position-x: -31px;
149 }
150
151 .community-wiki {
152@@ -1817,14 +1815,6 @@
153 padding: 0 0 3px;
154 }
155
156-.favorite-mark {
157- background: url("../images/vote-favorite-off.png") no-repeat scroll center center transparent;
158-}
159-
160-.favorite-mark.on, a.favorite-mark:hover {
161- background: url("../images/vote-favorite-on.png") no-repeat scroll center center transparent;
162-}
163-
164 .favorite-count {
165 color: #777777;
166 font-family: Arial;
167@@ -1897,49 +1887,38 @@
168 margin-left: 4px;
169 }
170
171-a.comment-like, a.comment-delete, a.comment-edit, a.comment-convert, a.comment-convert-to-question {
172+/*Icone con hover da 14px*/
173+a.comment-delete, a.comment-edit, a.comment-like, a.comment-convert, a.comment-convert-to-question {
174+ background-image: url("../images/icon.png");
175+ background-repeat: no-repeat;
176+ background-color: transparent;
177+
178 margin-left: 2px;
179 width: 18px;
180 }
181
182+a.comment-delete {
183+ background-position-y: -18px;
184+}
185+
186+a.comment-edit {
187+ background-position-y: -36px;
188+}
189+
190 a.comment-like {
191- background: url("../images/comment-like.png") no-repeat scroll center center transparent;
192-}
193-
194-a.comment-like:hover, a.comment-like.on {
195- background: url("../images/comment-like-on.png") no-repeat scroll center center transparent;
196-}
197-
198-a.comment-delete {
199- background: url("../images/comment-delete.png") no-repeat scroll center center transparent;
200-}
201-
202-a.comment-delete:hover {
203- background: url("../images/comment-delete-hover.png") no-repeat scroll center center transparent;
204+ background-position-y: -52px;
205 }
206
207 a.comment-convert {
208- background: url("../images/convert-off.png") no-repeat scroll center center transparent;
209-}
210-
211-a.comment-convert:hover {
212- background: url("../images/convert-hover.png") no-repeat scroll center center transparent;
213+ background-position-y: -69px;
214 }
215
216 a.comment-convert-to-question {
217- background: url("../images/convert-to-question-off.png") no-repeat scroll center center transparent;
218-}
219-
220-a.comment-convert-to-question:hover {
221- background: url("../images/convert-to-question-hover.png") no-repeat scroll center center transparent;
222-}
223-
224-a.comment-edit {
225- background: url("../images/comment-edit.png") no-repeat scroll center center transparent;
226-}
227-
228-a.comment-edit:hover {
229- background: url("../images/comment-edit-hover.png") no-repeat scroll center center transparent;
230+ background-position-y: -86px;
231+}
232+
233+a.comment-delete:hover, a.comment-edit:hover, a.comment-like:hover, a.comment-like.on, a.comment-convert:hover, a.comment-convert-to-question:hover {
234+ background-position-x: -19px;
235 }
236
237 img.subscription-remove {

Subscribers

People subscribed via source and target branches

to all changes: