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

Proposed by Giuseppe Terrasi
Status: Merged
Merge reported by: Giuseppe Terrasi
Merged at revision: not available
Proposed branch: lp:~rpadovani/ubuntu-it-ask/curve
Merge into: lp:~ubuntu-it-ask/ubuntu-it-ask/dev
Diff against target: 116 lines (+30/-8)
2 files modified
forum/skins/light/media/style/style.css (+29/-7)
forum/skins/light/templates/base_content.html (+1/-1)
To merge this branch: bzr merge lp:~rpadovani/ubuntu-it-ask/curve
Reviewer Review Type Date Requested Status
Giuseppe Terrasi (community) Approve
Review via email: mp+116154@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Giuseppe Terrasi (giuseppeterrasi-deactivatedaccount) wrote :

Importato nella revisione 50 del ramo dev.

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/light/pictogram-delete-white.png'
2Binary files forum/skins/light/media/images/light/pictogram-delete-white.png 1970-01-01 00:00:00 +0000 and forum/skins/light/media/images/light/pictogram-delete-white.png 2012-07-22 11:38:18 +0000 differ
3=== modified file 'forum/skins/light/media/style/style.css'
4--- forum/skins/light/media/style/style.css 2012-07-20 11:08:25 +0000
5+++ forum/skins/light/media/style/style.css 2012-07-22 11:38:18 +0000
6@@ -645,11 +645,14 @@
7
8 .paginator .page, .paginator .page a:visited, .paginator .curr {
9 background-color: white;
10- border: 1px solid #DD4818;
11+ border: 1px solid white;
12 color: #DD4818;
13 font: 0.875em Ubuntu;
14 margin: 0 0.25em;
15 padding: 0.25em;
16+ border-radius: 3px;
17+ -moz-border-radius: 3px;
18+ -webkit-border-radius: 3px;
19 }
20
21 .paginator .curr {
22@@ -702,6 +705,9 @@
23 padding: 1px 8px;
24 text-decoration: none;
25 white-space: nowrap;
26+ border-radius: 3px;
27+ -moz-border-radius: 3px;
28+ -webkit-border-radius: 3px;
29 }
30
31 .tags a:hover, .tags-summary a:hover {
32@@ -727,6 +733,10 @@
33 font-weight: bold;
34 line-height: 250%;
35 padding: 4px 12px 4px 6px;
36+ border: 1px solid #DD4818;
37+ border-radius: 3px;
38+ -moz-border-radius: 3px;
39+ -webkit-border-radius: 3px;
40 }
41
42 a.medal {
43@@ -735,10 +745,13 @@
44 }
45
46 a.medal:hover {
47- /*background: url("../images/medala_on.gif") no-repeat scroll 0 0 transparent;*/
48 background-color: white;
49 color: #DD4818;
50 text-decoration: none;
51+ border: 1px solid white;
52+ border-radius: 3px;
53+ -moz-border-radius: 3px;
54+ -webkit-border-radius: 3px;
55 }
56
57 .tabBar {
58@@ -788,6 +801,7 @@
59 .tabsA a.on, .tabsA a:hover {
60 background: none repeat scroll 0 0 #FFFFFF;
61 color: #DD4818;
62+ border-radius: 3px;
63 }
64
65 .tabsA a:hover {
66@@ -1234,6 +1248,9 @@
67 text-align: center;
68 text-decoration: none;
69 width: 20px;
70+ border-radius: 50%;
71+ -moz-border-radius: 50%;
72+ -webkit-border-radius: 50%;
73 }
74
75 .vote-count {
76@@ -1487,17 +1504,22 @@
77 margin-top: 5px;
78 }
79
80+.gravatar {
81+ border-radius: 50%;
82+ -moz-border-radius: 50%;
83+ -webkit-border-radius: 50%;
84+}
85+
86 #close-notify {
87- border: 2px solid white;
88- color: white;
89 cursor: pointer;
90- font-size: 14px;
91- line-height: 18px;
92 padding: 0 3px;
93 position: absolute;
94 right: 5px;
95- text-decoration: none;
96 top: 5px;
97+ background-image: url(../images/light/pictogram-delete-white.png);
98+ background-repeat: no-repeat;
99+ height: 20px;
100+ width: 20px;
101 }
102
103 #close-notify:hover {
104
105=== modified file 'forum/skins/light/templates/base_content.html'
106--- forum/skins/light/templates/base_content.html 2012-07-11 13:07:08 +0000
107+++ forum/skins/light/templates/base_content.html 2012-07-22 11:38:18 +0000
108@@ -147,7 +147,7 @@
109 {% endfor %}
110 {% endif %}
111 {% endautoescape %}
112- <a id="close-notify" onclick="notify.close(true)">&#215;</a>
113+ <a id="close-notify" onclick="notify.close(true)"></a>
114 </div>
115 </body>
116 </html>

Subscribers

People subscribed via source and target branches

to all changes: