Ubuntu NL Artwork

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

  1. lots-of-css-changes
  2. Merge into light-smf-theme-new
Proposed by Ronnie
Status: Merged
Merged at revision: 14
Proposed branch: lp:~ronnie.vd.c/ubuntu-nl-artwork/lots-of-css-changes
Merge into: lp:ubuntu-nl-artwork/light-smf-theme
Diff against target: 290 lines (+56/-30)
1 file modified
css/index.css (+56/-30)
To merge this branch: bzr merge lp:~ronnie.vd.c/ubuntu-nl-artwork/lots-of-css-changes
Reviewer Review Type Date Requested Status
Yordi de Graaf (community) Approve
Review via email: mp+94607@code.launchpad.net
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'
2--- css/index.css 2012-02-24 17:39:46 +0000
3+++ css/index.css 2012-02-24 19:05:21 +0000
4@@ -36,8 +36,9 @@
5 background: url("../images/dotted.png") repeat scroll 0 0 #F7F7F7;
6 font: 80%/130% 'Ubuntu','Ubuntubeta','Arial','Liberation Sans','DejaVu Sans',sans-serif;
7 margin: 0 auto;
8- overflow-x: hidden;
9+ overflow-x: auto;
10 overflow-y: scroll;
11+ min-width: 980px;
12 }
13
14 /* Help popups require a different styling of the body element. */
15@@ -81,7 +82,7 @@
16 font: 95%/115% "Ubuntu", verdana, Helvetica, sans-serif;
17 color: #333;
18 background: #fff;
19- border: 1px solid #7f9db9;
20+ border: 1px solid #dfdfdf;
21 padding: 2px;
22 }
23
24@@ -113,7 +114,16 @@
25 cursor: pointer;
26 font-weight: normal;
27 padding: 4px 16px;
28- text-shadow: 1px 1px 1px #b03910;
29+ text-shadow: 1px 1px 1px #b03910; /* DD4814 + 20% 000000 */
30+}
31+.button_submit[name="cancel"],
32+.button_submit[name="delete"],
33+.button_submit[name="preview"],
34+.button_submit[name="edit_notify_boards"],
35+.button_submit[name="edit_notify_topics"]
36+{
37+ background-color: #aea79f;
38+ text-shadow: 1px 1px 1px #8b857f; /* aea79f + 20% 000000 */
39 }
40 input:hover, textarea:hover, button:hover, select:hover
41 {
42@@ -326,7 +336,6 @@
43 border: 1px solid #DFDFDF;
44 line-height: 1.5em;
45 padding: 10px 1em;
46- white-space: nowrap;
47 /* Show a scrollbar after about 24 lines. */
48 max-height: 24em;
49 overflow: auto!important;
50@@ -410,8 +419,7 @@
51 .highlight
52 {
53 font-weight: bold;
54- color: #ff7200 !important;
55- font-size: 1.1em;
56+ color: #842B0C !important;
57 }
58
59 /* A more discreet highlight color, for selected membergroups etc. */
60@@ -630,8 +638,8 @@
61 padding: 0.5em 1em;
62 font-size: 0.9em;
63 line-height: 1.4em;
64- border: 1px solid #bbb;
65- background: #f5f5f0;
66+ border: 1px solid #dfdfdf;
67+ background: #f7f7f7;
68 margin: 0.2em 1px 1em 1px;
69 }
70 .description_board
71@@ -645,8 +653,8 @@
72 padding: 0.5em 1em;
73 font-size: 0.9em;
74 line-height: 1.3em;
75- border: 1px solid #bbb;
76- background: #f0f6f0;
77+ border: 1px solid #dfdfdf;
78+ background-color: #f7f7f7;
79 margin: 0.2em 1px 1em 1px;
80 }
81 .information p
82@@ -808,7 +816,6 @@
83 }
84 div.title_bar
85 {
86- background: #e3e9ef url(../images/theme/main_block.png) no-repeat 0 -200px;
87 height: 31px;
88 overflow: hidden;
89 margin-bottom: 1px;
90@@ -967,7 +974,7 @@
91 ------------------------------------------------------- */
92 .content
93 {
94- padding: 1em 0;
95+ padding: 1em;
96 border: none;
97 }
98 .content p
99@@ -1190,7 +1197,7 @@
100 }
101 .dropmenu li li.additional_items
102 {
103- background-color: #fff;
104+ background-color: #f7f7f7 ;
105 }
106
107 /* The dropdown menu toggle image */
108@@ -1287,7 +1294,7 @@
109
110 #adm_submenus
111 {
112- padding-left: 2em;
113+ margin-left: -15px;
114 overflow: hidden;
115 }
116
117@@ -1548,6 +1555,7 @@
118 .search {
119 float: right;
120 line-height: 40px;
121+ margin-right: 20px;
122 }
123 .search .input_text {
124 background-color: #F0F0F0;
125@@ -1969,14 +1977,12 @@
126 }
127 h4#pollquestion
128 {
129- padding: 0 1em 0.5em;
130+ padding: 0 0 0.5em;
131 }
132
133 /* Poll vote options */
134 #poll_options ul.options
135 {
136- border-top: 1px solid #dfdfdf;
137- padding: 1em 1em 1em;
138 margin: 0 0 1em 0;
139 }
140 #poll_options ul.options li
141@@ -1986,8 +1992,6 @@
142 #poll_options div.submitbutton
143 {
144 clear: both;
145- padding: 0 12px;
146- margin: 0;
147 }
148
149 /* Poll results */
150@@ -2199,8 +2203,8 @@
151 padding: 0 0 0 20px;
152 display: block;
153 height: 20px;
154- line-height: 0;
155- font-size: 0;
156+ line-height: 0px;
157+ font-size: 0px;
158 text-indent: -9999px;
159 float: left;
160
161@@ -2801,7 +2805,7 @@
162 #admin_menu
163 {
164 min-height: 2em;
165- padding-left: 0;
166+ margin-left: -15px;
167 }
168 #admin_content
169 {
170@@ -2821,6 +2825,17 @@
171 {
172 padding: 0 0 1em 0;
173 }
174+#search_go
175+{
176+ background-color: #b03910;
177+ border: 1px solid #b03910;
178+ padding: 2px 16px;
179+}
180+#quick_search form.floatright, h3.catbg #quick_search form.floatright
181+{
182+ padding: 4px;
183+}
184+
185
186 /* Styles for sidebar menus.
187 ------------------------------------------------------- */
188@@ -2845,13 +2860,14 @@
189 {
190 position: relative;
191 }
192-.left_admmenu li
193+.left_admmenu li a
194 {
195- padding: 0 0 0 0.5em;
196+ padding: 0.6em;
197+ display: block;
198 }
199 .left_admmenu
200 {
201- margin-bottom: 0.5em;
202+ margin-bottom: 2.5em;
203 }
204 #main_admsection
205 {
206@@ -2861,7 +2877,7 @@
207 overflow: hidden;
208 }
209
210-tr.windowbg td, tr.windowbg2 td, tr.approvebg td, tr.highlight2 td
211+tr.windowbg td, tr.windowbg2 td, tr.approvebg td, tr.highlight2 td, tr td.windowbg, tr td.windowbg2
212 {
213 padding: 0.3em 0.7em;
214 }
215@@ -3007,7 +3023,7 @@
216 }
217 #basicinfo .windowbg .content
218 {
219- padding-left: 20px;
220+ margin-bottom: 12px;
221 }
222 #detailedinfo
223 {
224@@ -3037,6 +3053,7 @@
225 {
226 list-style-type: none;
227 margin: 10px 0 0 0;
228+ overflow: hidden;
229 }
230 #basicinfo ul li
231 {
232@@ -3049,11 +3066,20 @@
233 {
234 display: block;
235 clear: both;
236+ margin-top: 12px;
237 }
238 #basicinfo span#userstatus img
239 {
240 vertical-align: middle;
241 }
242+#basicinfo #infolinks
243+{
244+ margin-top: 8px;
245+}
246+#basicinfo #infolinks a
247+{
248+ line-height: 2em;
249+}
250 #detailedinfo div.content dl, #tracking div.content dl
251 {
252 clear: right;
253@@ -3114,7 +3140,6 @@
254 }
255 #main_admsection #basicinfo h4
256 {
257- float: left;
258 width: 35%;
259 }
260 #main_admsection #basicinfo img.avatar
261@@ -3125,10 +3150,12 @@
262 #main_admsection #basicinfo ul
263 {
264 clear: left;
265+ overflow: hidden;
266 }
267 #main_admsection #basicinfo span#userstatus
268 {
269 clear: left;
270+ margin-top: 12px;
271 }
272 #main_admsection #basicinfo p#infolinks
273 {
274@@ -3286,7 +3313,7 @@
275 }
276 .list_posts
277 {
278- border-top: 2px solid #b3b3bf;
279+ border-top: 1px solid #dfdfdf;
280 padding-top: 12px;
281 margin-top: 6px;
282 overflow: auto;
283@@ -3351,7 +3378,6 @@
284 .ignoreboards a
285 {
286 font-weight: bold;
287- border-bottom: 1px solid #c4c4c4;
288 padding: 0.1em 0;
289 }
290 .ignoreboards a:hover

Subscribers

People subscribed via source and target branches