Ubuntu Website - OBSOLETE

Merge lp:~cjohnston/ubuntu-website/header-color-fix-django into lp:~ubuntu-website-community/ubuntu-website/light-django-theme

  1. header-color-fix-django
  2. Merge into light-django-theme
Proposed by Chris Johnston
Status: Merged
Approved by: Michael Hall
Approved revision: 27
Merged at revision: 26
Proposed branch: lp:~cjohnston/ubuntu-website/header-color-fix-django
Merge into: lp:~ubuntu-website-community/ubuntu-website/light-django-theme
Diff against target: 208 lines (+108/-44)
3 files modified
media/css/default.css (+36/-15)
media/css/ie.css (+36/-15)
media/css/ie6.css (+36/-14)
To merge this branch: bzr merge lp:~cjohnston/ubuntu-website/header-color-fix-django
Reviewer Review Type Date Requested Status
Chris Johnston Pending
Review via email: mp+36885@code.launchpad.net
To post a comment you must log in.
lp:~cjohnston/ubuntu-website/header-color-fix-django updated
27. By Chris Johnston

Fixes CSS issues

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'media/css/default.css'
2--- media/css/default.css 2010-09-28 15:23:37 +0000
3+++ media/css/default.css 2010-09-28 16:22:40 +0000
4@@ -45,14 +45,43 @@
5 -------------------------------------------------------------------------------------------------------- */
6
7 body { font-family: 'Ubuntubeta','Ubuntu','Bitstream Vera Sans','DejaVu Sans', Tahoma, sans-serif; font-size:100%; line-height:1.5em;}
8-h1 { font-size:2.25em; /* 16x2.25 =36 */ }
9-h2 { font-size:1.5em; /* 16x1.5 =24 */ }
10-h3 { font-size:1.125em; /* 16x1.125=18 */ }
11-h4 { font-size:1.0em; /* 16x1.0 =16 */ }
12-h5 { font-size:0.875em; /* 16x0.75 =14 */ }
13-h6 { font-size:0.75em; font-weight:bold; /* 16x0.75 =12 */ }
14+h1, h2, h3 {
15+ color: #333333;
16+ font-weight: normal;
17+ margin: 0px;
18+}
19+
20+h1 {
21+ font-size: 36px;
22+ line-height: 40px;
23+
24+ margin-top: 16px;
25+ margin-bottom: 8px;
26+
27+}
28+
29+h2 {
30+ font-size: 24px;
31+ line-height: 28px;
32+ font-weight: normal;
33+ margin-top: 16px;
34+ margin-bottom: 8px;
35+}
36+
37+h3 {
38+ font-size: 16px;
39+ line-height: 20px;
40+ font-weight: normal;
41+ margin-top: 16px;
42+ margin-bottom: 8px;
43+}
44+
45+p {
46+ font-size: 12px;
47+ line-height: 16px;
48+}
49+
50 dt { font-size:0.75em; font-weight:bold; /* 16x0.75 =12 */ }
51-p { font-size:0.75em; line-height:1.5em; /* 16x0.75 =12 */ }
52 li { font-size:0.75em; line-height:1.5em; /* 16x0.75=12 */ }
53 td li, li li { font-size:100%; line-height:100%; /* reset */ }
54 strong { font-weight:bold;}
55@@ -127,14 +156,6 @@
56 /*- Decoration
57 -------------------------------------------------------------------------------------------------------- */
58
59-h1,
60-h2,
61-h3,
62-h4,
63-h5,
64-h6 { color:#DD4814; }
65-
66-
67 body { background:url("../images/dotted.png") repeat scroll 0 0 #FFFFFF; color:#333333; }
68 #page-header { background:url("../images/header.png") repeat-x scroll 0 0 #DD4814; height:70px; }
69 #page-header .container { background:url("../images/header.png") repeat-x scroll 0 0 #DD4814; }
70
71=== modified file 'media/css/ie.css'
72--- media/css/ie.css 2010-09-28 15:23:37 +0000
73+++ media/css/ie.css 2010-09-28 16:22:40 +0000
74@@ -46,14 +46,43 @@
75 -------------------------------------------------------------------------------------------------------- */
76
77 body { font-family: 'Ubuntubeta','Ubuntu','Bitstream Vera Sans','DejaVu Sans', Tahoma, sans-serif; font-size:100%; line-height:1.5em;}
78-h1 { font-size:2.25em; /* 16x2.25 =36 */ }
79-h2 { font-size:1.5em; /* 16x1.5 =24 */ }
80-h3 { font-size:1.125em; /* 16x1.125=18 */ }
81-h4 { font-size:1.0em; /* 16x1.0 =16 */ }
82-h5 { font-size:0.875em; /* 16x0.75 =14 */ }
83-h6 { font-size:0.75em; font-weight:bold; /* 16x0.75 =12 */ }
84+h1, h2, h3 {
85+ color: #333333;
86+ font-weight: normal;
87+ margin: 0px;
88+}
89+
90+h1 {
91+ font-size: 36px;
92+ line-height: 40px;
93+
94+ margin-top: 16px;
95+ margin-bottom: 8px;
96+
97+}
98+
99+h2 {
100+ font-size: 24px;
101+ line-height: 28px;
102+ font-weight: normal;
103+ margin-top: 16px;
104+ margin-bottom: 8px;
105+}
106+
107+h3 {
108+ font-size: 16px;
109+ line-height: 20px;
110+ font-weight: normal;
111+ margin-top: 16px;
112+ margin-bottom: 8px;
113+}
114+
115+p {
116+ font-size: 12px;
117+ line-height: 16px;
118+}
119+
120 dt { font-size:0.75em; font-weight:bold; /* 16x0.75 =12 */ }
121-p { font-size:0.75em; line-height:1.5em; /* 16x0.75 =12 */ }
122 li { font-size:0.75em; line-height:1.5em; /* 16x0.75=12 */ }
123 strong { font-weight:bold;}
124 em { font-style:italic; }
125@@ -130,14 +159,6 @@
126 /*- Decoration
127 -------------------------------------------------------------------------------------------------------- */
128
129-h1,
130-h2,
131-h3,
132-h4,
133-h5,
134-h6 { color:#DD4814; }
135-
136-
137 body { background:url("../images/dotted.png") repeat scroll 0 0 #FFFFFF; color:#333333; }
138 #page-header { background:url("../images/header.png") repeat-x scroll 0 0 #DD4814; height:70px; }
139 #page-header .container { background:url("../images/header.png") repeat-x scroll 0 0 #DD4814; }
140
141=== modified file 'media/css/ie6.css'
142--- media/css/ie6.css 2010-09-28 15:23:37 +0000
143+++ media/css/ie6.css 2010-09-28 16:22:40 +0000
144@@ -45,14 +45,43 @@
145 -------------------------------------------------------------------------------------------------------- */
146
147 body { font-family: 'Ubuntubeta','Ubuntu','Bitstream Vera Sans','DejaVu Sans', Tahoma, sans-serif; font-size:100%; line-height:1.5em;}
148-h1 { font-size:2.25em; /* 16x2.25 =36 */ }
149-h2 { font-size:1.5em; /* 16x1.5 =24 */ }
150-h3 { font-size:1.125em; /* 16x1.125=18 */ }
151-h4 { font-size:1.0em; /* 16x1.0 =16 */ }
152-h5 { font-size:0.875em; /* 16x0.75 =14 */ }
153-h6 { font-size:0.75em; font-weight:bold; /* 16x0.75 =12 */ }
154+h1, h2, h3 {
155+ color: #333333;
156+ font-weight: normal;
157+ margin: 0px;
158+}
159+
160+h1 {
161+ font-size: 36px;
162+ line-height: 40px;
163+
164+ margin-top: 16px;
165+ margin-bottom: 8px;
166+
167+}
168+
169+h2 {
170+ font-size: 24px;
171+ line-height: 28px;
172+ font-weight: normal;
173+ margin-top: 16px;
174+ margin-bottom: 8px;
175+}
176+
177+h3 {
178+ font-size: 16px;
179+ line-height: 20px;
180+ font-weight: normal;
181+ margin-top: 16px;
182+ margin-bottom: 8px;
183+}
184+
185+p {
186+ font-size: 12px;
187+ line-height: 16px;
188+}
189+
190 dt { font-size:0.75em; font-weight:bold; /* 16x0.75 =12 */ }
191-p { font-size:0.75em; line-height:1.5em; /* 16x0.75 =12 */ }
192 li { font-size:0.75em; line-height:1.5em; /* 16x0.75=12 */ }
193 strong { font-weight:bold;}
194 em { font-style:italic; }
195@@ -126,13 +155,6 @@
196 .plugin { margin: 0 -10px; padding:0px; position:relative; width:980px; }
197 /*- Decoration
198 -------------------------------------------------------------------------------------------------------- */
199-h1,
200-h2,
201-h3,
202-h4,
203-h5,
204-h6 { color:#DD4814; }
205-
206
207 body { background:url("../images/dotted.png") repeat scroll 0 0 #FFFFFF; color:#333333; }
208 #page-header { background:url("../images/header.png") repeat-x scroll 0 0 #DD4814; height:70px; }

Subscribers

People subscribed via source and target branches