Merge lp:~ronnie.vd.c/ubuntu-nl-artwork/css-improvements into lp:ubuntu-nl-artwork/light-smf-theme

Proposed by Ronnie
Status: Merged
Merged at revision: 7
Proposed branch: lp:~ronnie.vd.c/ubuntu-nl-artwork/css-improvements
Merge into: lp:ubuntu-nl-artwork/light-smf-theme
Diff against target: 457 lines (+97/-64)
2 files modified
css/index.css (+95/-62)
index.template.php (+2/-2)
To merge this branch: bzr merge lp:~ronnie.vd.c/ubuntu-nl-artwork/css-improvements
Reviewer Review Type Date Requested Status
Yordi de Graaf Approve
Review via email: mp+94366@code.launchpad.net

Description of the change

Veel verbeteringen in de css

To post a comment you must log in.
Revision history for this message
Yordi de Graaf (yddegraaf) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'css/index.css' (properties changed: +x to -x)
2--- css/index.css 2011-11-26 14:22:50 +0000
3+++ css/index.css 2012-02-23 13:13:19 +0000
4@@ -36,6 +36,8 @@
5 background: url("../images/dotted.png") repeat scroll 0 0 #F7F7F7;
6 font: 80%/130% 'Ubuntu','Ubuntubeta','Bitstream Vera Sans','DejaVu Sans',Tahoma,sans-serif;
7 margin: 0 auto;
8+ overflow-x: hidden;
9+ overflow-y: scroll;
10 }
11
12 /* Help popups require a different styling of the body element. */
13@@ -296,13 +298,11 @@
14 /* A quote, perhaps from another post. */
15 blockquote.bbc_standard_quote, blockquote.bbc_alternate_quote
16 {
17- font-size: x-small;
18 color: #333;
19 line-height: 1.4em;
20 background: url(../images/theme/quote.png) 0.1em 0.1em no-repeat;
21- border-top: 2px solid #DD4814;
22- border-bottom: 2px solid #DD4814;
23- padding: 1.1em 1.4em;
24+ border: 1px solid #DFDFDF;
25+ padding: 1.2em 1.4em;
26 margin: 0.1em 0 0.3em 0;
27 overflow: auto;
28 }
29@@ -310,28 +310,26 @@
30 /* Alterate blockquote stylings */
31 blockquote.bbc_standard_quote
32 {
33- background-color: #FCC9A4;
34+ background-color: #FFF;
35 }
36 blockquote.bbc_alternate_quote
37 {
38- background-color: #FCC9A4;
39+ background-color: #fff;
40 }
41
42 /* A code block - maybe PHP ;). */
43 code.bbc_code
44 {
45 display: block;
46- font-family: "Ubuntu", "dejavu sans mono", "monaco", "lucida console", "courier new", monospace;
47- font-size: x-small;
48- background: #DDD7D1;
49- border-top: 2px solid #DD4814;
50- border-bottom: 2px solid #DD4814;
51+ font-family: "Ubuntu Mono Regular", "dejavu sans mono", "monaco", "lucida console", "courier new", monospace;
52+ background-color: #FFF;
53+ border: 1px solid #DFDFDF;
54 line-height: 1.5em;
55- padding: 3px 1em;
56- overflow: auto;
57+ padding: 10px 1em;
58 white-space: nowrap;
59 /* Show a scrollbar after about 24 lines. */
60 max-height: 24em;
61+ overflow: auto!important;
62 }
63
64 /* The "Quote:" and "Code:" header parts... */
65@@ -341,6 +339,7 @@
66 font-size: x-small;
67 font-weight: bold;
68 padding: 0 0.3em;
69+ margin-top: 8px;
70 }
71
72 /* For links to change the code stuff... */
73@@ -481,7 +480,7 @@
74 {
75 font-size: 0.9em;
76 overflow: hidden;
77- margin-bottom: 1px;
78+ margin: 12px 0;
79 }
80 div.pagesection div.floatright input
81 {
82@@ -490,7 +489,7 @@
83
84 .pagelinks
85 {
86- padding: 0.6em 0 0.4em 0;
87+ padding: 8px 0 0 0;
88 }
89
90 /* Colors for background of posts requiring approval */
91@@ -520,23 +519,24 @@
92 /* Sticky topics get a different background */
93 .stickybg
94 {
95- background: #C6A4C0;
96+ background: #EFEFEF;
97+ border-bottom: 1px solid #CCC;
98 }
99 .stickybg2
100 {
101- background: #C6A4C0;
102+ background: #EFEFEF;
103+ border-bottom: 1px solid #CCC;
104 }
105
106 /* Locked posts get a different shade, too! */
107-.lockedbg
108+.lockedbg, .lockedbg2
109 {
110- background: #AEA79F;
111- font-style: italic;
112+ background-color: #F7F7F7;
113 }
114-.lockedbg2
115+.lockedbg a, .lockedbg2 a
116 {
117- background: #AEA79F;
118- font-style: italic;
119+ color: #666;
120+ background-color: #F7F7F7;
121 }
122
123 /* Posts and personal messages displayed throughout the forum. */
124@@ -758,8 +758,8 @@
125 }
126 h3.catbg a:hover, h4.catbg a:hover, .table_list tbody.header td a:hover
127 {
128- color: #333;
129- text-decoration: none;
130+ color: #fff;
131+ text-decoration: underline;
132 }
133 h3.catbg2 a:hover
134 {
135@@ -804,7 +804,6 @@
136 height: 31px;
137 overflow: hidden;
138 margin-bottom: 1px;
139- border-radius: 4px;
140 }
141 div.title_bar
142 {
143@@ -870,9 +869,11 @@
144 }
145 tr.catbg th.first_th
146 {
147+ width: 55px;
148 }
149 tr.catbg th.last_th
150 {
151+ width: 250px;
152 }
153 tr.titlebg th.first_th
154 {
155@@ -909,7 +910,6 @@
156 table.table_grid thead tr.catbg th
157 {
158 white-space: nowrap;
159- width: 0;
160 }
161
162 /* table_grid styles for Profile > Show Permissions. */
163@@ -969,9 +969,6 @@
164 padding: 0.5em 1.2em;
165 margin: 0;
166 border: none;
167- background-color: #FFFFFF;
168- border-radius: 4px 4px 4px 4px;
169- box-shadow: 1px 1px 2px #CCCCCC;
170 margin: 10px 0;
171 }
172 .content p
173@@ -1215,8 +1212,9 @@
174
175 .buttonlist ul
176 {
177- z-index: 100;
178+ overflow: hidden;
179 margin: 0 0.2em 0 0;
180+ padding: 0;
181 }
182 .buttonlist ul li
183 {
184@@ -1230,7 +1228,7 @@
185 display: block;
186 font-size: 1.2em;
187 color: #333;
188- background: #f7f7f7;
189+ background: #fff;
190 padding: 4px 8px;
191 margin-left: 8px;
192 cursor: pointer;
193@@ -1239,7 +1237,7 @@
194 .buttonlist ul li a:hover
195 {
196 text-decoration: none;
197- background-color: #DFDFDF;
198+ background-color: #F7F7F7;
199 }
200 .buttonlist ul li a span
201 {
202@@ -1378,6 +1376,16 @@
203 margin-left: 1em;
204 }
205 /* the upper_section, float the two each way */
206+#upper-content
207+{
208+ padding: 0.5em 1.2em;
209+ margin: 0;
210+ border: none;
211+ background-color: #FFFFFF;
212+ border-radius: 4px 4px 4px 4px;
213+ box-shadow: 1px 1px 2px #CCCCCC;
214+ margin: 30px 0 20px;
215+}
216 #upper_section ul li.greeting
217 {
218 font-size: 1.3em;
219@@ -1686,7 +1694,7 @@
220 }
221 table.table_list td, table.table_list th
222 {
223- padding: 5px;
224+ padding: 0 8px 5px;
225 }
226 table.table_list tbody.header td
227 {
228@@ -1695,14 +1703,14 @@
229 table.table_list tbody.content td.stats
230 {
231 font-size: 90%;
232- width: 15%;
233+ width: 80px;
234 text-align: left;
235 }
236 table.table_list tbody.content td.lastpost
237 {
238 line-height: 1.3em;
239 font-size: 85%;
240- width: 24%;
241+ width: 250px;
242 }
243 table.table_list tbody.content td.icon
244 {
245@@ -1740,33 +1748,36 @@
246 #posting_icons
247 {
248 padding: 0 1em 0.5em 1em;
249- margin: 0 0 1em 0;
250+ margin: 1em 0;
251 line-height: 1em;
252 }
253 #posting_icons ul
254 {
255 font-size: 0.8em;
256 }
257+#posting_icons li
258+{
259+ margin-right: 18px;
260+}
261 #posting_icons img
262 {
263 vertical-align: middle;
264- margin: 0 0 0 4ex;
265+ margin-right: 4px;
266 }
267 #postbuttons_upper ul li a span
268 {
269 line-height: 19px;
270 padding: 0 0 0 6px;
271 }
272-.nextlinks
273-{
274- text-align: right;
275- margin-top: -1px;
276-}
277-.nextlinks_bottom
278-{
279- clear: right;
280- text-align: right;
281-}
282+.nextlinks, .nextlinks_bottom
283+{
284+ float: left;
285+ margin: 8px 12px 0 0;
286+}
287+.nextlinks a, .nextlinks_bottom a {
288+ padding: 8px;
289+}
290+
291 .mark_read
292 {
293 padding: 0 0.5em;
294@@ -1872,7 +1883,6 @@
295 }
296 .table_frame .table_list td.icon, .table_frame .table_list td.info, .table_frame .table_list td.stats
297 {
298- border-right: 2px solid white;
299 }
300 #messageindex
301 {
302@@ -1899,7 +1909,7 @@
303 {
304 float: right;
305 padding: 4px;
306- margin-right: -25px;
307+ margin-right: -20px;
308 }
309
310 /* Styles for the display template (topic view).
311@@ -1935,6 +1945,7 @@
312 #moderationbuttons
313 {
314 overflow: hidden;
315+ font-size: 0.8em;
316 }
317 /* Events */
318 .linked_events
319@@ -2033,6 +2044,7 @@
320 #forumposts
321 {
322 clear: both;
323+ overflow: hidden;
324 }
325 #forumposts .cat_bar
326 {
327@@ -2062,6 +2074,9 @@
328 {
329 float:left;
330 width:100%;
331+ position: relative;
332+ border-bottom: 1px solid #CCC;
333+ padding: 8px 0 12px;
334 }
335 .poster
336 {
337@@ -2074,11 +2089,12 @@
338 }
339 .postarea div.flow_hidden
340 {
341- width: 100%;
342+ margin-bottom: 8px;
343 }
344
345 .moderatorbar
346 {
347+ margin-top: 12px;
348 clear: right;
349 }
350 /* poster details and list of items */
351@@ -2139,12 +2155,9 @@
352 }
353 .modifybutton
354 {
355- clear: right;
356- float: right;
357- margin: 6px 20px 10px 0;
358- text-align: right;
359- font: bold 0.85em "Ubuntu", arial, sans-serif;
360- color: #334466;
361+ position: absolute;
362+ right: 8px;
363+ top: 58px;
364 }
365
366 /* The quick buttons */
367@@ -2157,7 +2170,7 @@
368
369 ul.quickbuttons
370 {
371- margin: 0.9em 11px 0 0;
372+ margin: 5px 8px 0 0;
373 clear: right;
374 float: right;
375 text-align: right;
376@@ -2174,8 +2187,11 @@
377 padding: 0 0 0 20px;
378 display: block;
379 height: 20px;
380- line-height: 18px;
381+ line-height: 0;
382+ font-size: 0;
383+ text-indent: -9999px;
384 float: left;
385+
386 }
387 ul.quickbuttons a:hover
388 {
389@@ -2226,12 +2242,13 @@
390 {
391 margin-top: 0.5em;
392 clear: right;
393+ background-color: #F7F7F7;
394+ padding: 12px;
395+ border-top: 1px solid #dfdfdf;
396 }
397 .inner
398 {
399- padding: 1em 1em 2px 0;
400- margin: 0 1em 0 0;
401- border-top: 1px solid #99a;
402+ margin-right: 25px;
403 }
404 img.smiley
405 {
406@@ -2853,6 +2870,7 @@
407 {
408 text-align: left;
409 width: 0;
410+ padding-left: 8px;
411 }
412 #topic_icons
413 {
414@@ -2862,6 +2880,21 @@
415 {
416 margin: 0;
417 }
418+#topic_icons img
419+{
420+ margin: 2px 5px 2px 0;
421+ vertical-align: middle;
422+}
423+#topic_icons .smalltext
424+{
425+ margin-left: 12px;
426+ float: left;
427+}
428+#topic_icons .smalltext.floatleft
429+{
430+ margin-left: 0;
431+
432+}
433 .topic_table table thead
434 {
435 border-bottom: 1px solid #fff;
436
437=== modified file 'index.template.php'
438--- index.template.php 2011-11-26 19:49:54 +0000
439+++ index.template.php 2012-02-23 13:13:19 +0000
440@@ -177,7 +177,7 @@
441 include("./Themes/light-smf-theme/header.template.php");
442 echo !empty($settings['forum_width']) ? '
443 <div id="wrapper" style="width: ' . $settings['forum_width'] . '">' : '','
444- <div class="content">
445+ <div id="upper-content">
446 <div id="upper_section" class="middletext">
447 <div class="user">';
448 // Show a random news item? (or you could pick one from news_lines...)
449@@ -252,7 +252,7 @@
450 template_menu();
451
452 echo'
453- <br class="clear" />';
454+ <div class="clear"></div>';
455
456
457 echo '

Subscribers

People subscribed via source and target branches