Merge lp:~pietroalbini/ubuntu-it-ask/pietro-2 into lp:ubuntu-it-ask

Proposed by Pietro Albini
Status: Merged
Approved by: Milo Casagrande
Approved revision: 83
Merged at revision: 76
Proposed branch: lp:~pietroalbini/ubuntu-it-ask/pietro-2
Merge into: lp:ubuntu-it-ask
Diff against target: 246 lines (+101/-23)
2 files modified
forum/skins/light/media/style/style.css (+87/-23)
forum/skins/light/templates/users/questions.html (+14/-0)
To merge this branch: bzr merge lp:~pietroalbini/ubuntu-it-ask/pietro-2
Reviewer Review Type Date Requested Status
Ubuntu-it Ask Pending
Review via email: mp+170806@code.launchpad.net

Description of the change

Some theme fixes

To post a comment you must log in.
83. By Pietro Albini

Restyled dialogs and dropdowns

Revision history for this message
Milo Casagrande (milo) wrote :

Pietro, is this the correct merge proposal?
There is another one that looks almost the same as this:

https://code.launchpad.net/~pietro98-albini/ubuntu-it-ask/pietro/+merge/170771

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'forum/skins/light/media/style/style.css'
2--- forum/skins/light/media/style/style.css 2013-05-20 16:05:21 +0000
3+++ forum/skins/light/media/style/style.css 2013-06-21 19:29:31 +0000
4@@ -562,6 +562,13 @@
5 width: 100%;
6 }*/
7
8+.question-summary-wrapper h2 a
9+{
10+ white-space: nowrap;
11+ overflow: hidden;
12+ text-overflow: ellipsis;
13+}
14+
15 .short-summary-title {
16 float: left;
17 }
18@@ -693,6 +700,7 @@
19 border-radius: 3px;
20 -moz-border-radius: 3px;
21 -webkit-border-radius: 3px;
22+ height: 100%;
23 }
24
25 .paginator .curr {
26@@ -815,31 +823,33 @@
27 }
28
29 .tabsA {
30+ background: #eeeeee;
31 display: block;
32 float: right;
33 font-weight: bold;
34- height: 20px;
35 position: relative;
36+ padding: 0 3px;
37+ border: 1px solid #cccccc;
38+ border-radius: 3px;
39+ -moz-border-radius: 3px;
40+ -webkit-border-radius: 3px;
41+ box-shadow: 0 1px 4px #cccccc;
42+ -webkit-box-shadow: 0 1px 4px #cccccc;
43+ -moz-box-shadow: 0 1px 4px #cccccc;
44+ -khtml-box-shadow: 0 1px 4px #cccccc;
45 }
46
47 .tabsA a, .sticky-sort-tabs {
48- background: #f0f0f0;
49+ background: #eeeeee;
50 color: #888A85;
51 display: block;
52 float: left;
53 line-height: 22px;
54- margin: 0px 4px;
55- text-decoration: none;
56- border-radius: 3px;
57- -moz-border-radius: 3px;
58- -webkit-border-radius: 3px;
59- box-shadow: 0 1px 3px #D0D0D0 inset;
60- -moz-box-shadow: 0 1px 3px #D0D0D0 inset;
61- -webkit-box-shadow: 0 1px 3px #D0D0D0 inset;
62+ text-decoration: none;
63 }
64
65 .tabsA a {
66- padding: 0 11px;
67+ padding: 0 11px;
68 }
69
70 .sticky-sort-tabs {
71@@ -854,10 +864,11 @@
72 margin: 2px;
73 }
74
75-.tabsA a.on, .tabsA a:hover {
76+.tabsA a.on {
77 background: none repeat scroll 0 0 #FFFFFF;
78 color: #DD4818;
79- box-shadow: 0 1px 5px #d0d0d0 inset;
80+ border-left: 1px solid #dddddd;
81+ border-right: 1px solid #dddddd;
82 }
83
84 .tabsA a:hover {
85@@ -1041,6 +1052,12 @@
86 overflow: hidden;
87 }
88
89+.badge-list li {
90+ text-overflow: ellipsis;
91+ overflow: hidden;
92+ white-space: nowrap;
93+}
94+
95
96 /*.badge-list a {
97 color: #DD4818;
98@@ -1272,6 +1289,30 @@
99 -webkit-border-radius: 4px;
100 }
101
102+.userSection
103+{
104+ margin: 20px 0;
105+}
106+
107+.userSection > h2
108+{
109+ float: left;
110+ width: 50%;
111+}
112+
113+.userSection .tabsA
114+{
115+ float: right;
116+ max-width: 50%;
117+}
118+
119+.userSection .tabsA:after
120+{
121+ clear: both;
122+ content: '';
123+ display: block;
124+}
125+
126 .user-info-table {
127 margin-bottom: 10px;
128 width: 100%;
129@@ -1343,7 +1384,7 @@
130 }
131
132 .question-title-link a {
133- color: #0077CC;
134+ color: #DD4814;
135 font-weight: bold;
136 }
137
138@@ -2079,24 +2120,28 @@
139
140
141 div.dialog, .context-menu-dropdown {
142- color: white;
143+ color: #000000;
144 font-size: 11px;
145 outline: none;
146- cursor: pointer;
147 text-align: center;
148 text-decoration: none;
149- padding: 1px 3px 3px 3px;
150+ padding: 3px;
151 -moz-border-radius: 4px;
152 -webkit-border-radius: 4px;
153 border-radius: 4px;
154- border: 2px solid #969696;
155- background: #ADA69F url('../images/menu-dropdown.png') repeat-x left bottom;
156- text-shadow: 0 1px 0 #777;
157+ border: 2px solid #aaaaaa;
158+ background: #f0f0f0;
159+}
160+
161+div.dialog
162+{
163+ padding: 30px;
164+ min-width: 300px;
165 }
166
167 .dialog a, .context-menu-dropdown a {
168- color: white;
169- font-weight: bold;
170+ color: #ffffff;
171+ cursor: pointer;
172 }
173
174 div.dialog .dialog-wcwontent {
175@@ -2104,6 +2149,11 @@
176 z-index: 1000;
177 }
178
179+div.dialog .dialog-content table
180+{
181+ width: 100%;
182+}
183+
184 div.dialog .dialog-buttons {
185 margin: 0px;
186 height: 25px;
187@@ -2129,6 +2179,7 @@
188 vertical-align: baseline;
189 font-weight: bold;
190 border: 0;
191+ cursor: pointer;
192 }
193
194 div.dialog.confirm, div.dialog.warning {
195@@ -2163,13 +2214,18 @@
196 height: 14px;
197 display: inline-block;
198 margin-left: 4px;
199- vertical-align: top;
200 }
201
202 .boxC .feed-icon {
203
204 }
205
206+.tabBar .feed-icon {
207+ position: relative;
208+ top: 6px;
209+ left: 5px;
210+}
211+
212 .feed-icon-big {
213 width: 28px;
214 height: 28px;
215@@ -2298,3 +2354,11 @@
216 h3.or_label, .signin_form#dummy_form_unused {
217 display: none !important;
218 }
219+
220+.no-item-to-display
221+{
222+ font-size: 16px;
223+ font-weight: bold;
224+ text-align: center;
225+ padding: 10px;
226+}
227
228=== added directory 'forum/skins/light/templates/users'
229=== added file 'forum/skins/light/templates/users/questions.html'
230--- forum/skins/light/templates/users/questions.html 1970-01-01 00:00:00 +0000
231+++ forum/skins/light/templates/users/questions.html 2013-06-21 19:29:31 +0000
232@@ -0,0 +1,14 @@
233+{% extends "user.html" %}
234+
235+{% load extra_tags question_list_tags i18n %}
236+{% block usercontent %}
237+<div class="user-stats-table">
238+{% if favorites %}
239+ {% for favorite in favorites %}
240+ {% question_list_item favorite.node favorite_count=yes signature_type=badges %}
241+ {% endfor %}
242+{% else %}
243+ <div class="no-item-to-display">{% trans "No favorite questions to display." %}</div>
244+{% endif %}
245+</div>
246+{% endblock %}

Subscribers

People subscribed via source and target branches