Ubuntu Website - OBSOLETE

Merge lp:~daker/ubuntu-website/fixes-644408 into lp:~ubuntu-website-community/ubuntu-website/light-base-theme

  1. fixes-644408
  2. Merge into light-base-theme
Proposed by Adnane Belmadiaf
Status: Merged
Approved by: Michael Hall
Approved revision: 5
Merged at revision: 16
Proposed branch: lp:~daker/ubuntu-website/fixes-644408
Merge into: lp:~ubuntu-website-community/ubuntu-website/light-base-theme
Diff against target: 113 lines (+12/-12)
6 files modified
css/default.css (+3/-3)
css/ie.css (+3/-3)
css/ie6.css (+3/-3)
css/wireframe-default.css (+1/-1)
css/wireframe-ie.css (+1/-1)
css/wireframe-ie6.css (+1/-1)
To merge this branch: bzr merge lp:~daker/ubuntu-website/fixes-644408
Reviewer Review Type Date Requested Status
Chris Johnston Pending
Review via email: mp+36630@code.launchpad.net

Commit message

* Fixed the header bakcground color (changed to #dd4814)
* Used the The Ubuntu font family (guidelines page 15)

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'css/default.css'
2--- css/default.css 2010-09-24 23:40:23 +0000
3+++ css/default.css 2010-09-25 12:09:40 +0000
4@@ -44,7 +44,7 @@
5 /*- Typography
6 -------------------------------------------------------------------------------------------------------- */
7
8-body { font-family: Helvetica,Arial,'Liberation Sans',FreeSans,sans-serif; font-size:100%; line-height:1.5em;}
9+body { font-family: Ubuntu, UbuntuBeta, 'Ubuntu Beta','Bitstream Vera Sans', 'DejaVu Sans', Tahoma, sans-serif; font-size:100%; line-height:1.5em;}
10 h1 { font-size:2.25em; /* 16x2.25 =36 */ }
11 h2 { font-size:1.5em; /* 16x1.5 =24 */ }
12 h3 { font-size:1.125em; /* 16x1.125=18 */ }
13@@ -135,8 +135,8 @@
14
15
16 body { background:url("../images/dotted.png") repeat scroll 0 0 #FFFFFF; color:#333333; }
17-#page-header { background:url("../images/header.png") repeat-x scroll 0 0 #EF5A29; height:72px; }
18-#page-header .container { background:url("../images/header.png") repeat-x scroll 0 0 #EF5A29; }
19+#page-header { background:url("../images/header.png") repeat-x scroll 0 0 #dd4814; height:70px; }
20+#page-header .container { background:url("../images/header.png") repeat-x scroll 0 0 #dd4814; }
21 #top-logo { color:#fff; line-height:1.5em; text-align:right; }
22 #the-logo { padding-left:4px; }
23 #loco { clear:both; display:block; float:right;}
24
25=== modified file 'css/ie.css'
26--- css/ie.css 2010-09-24 23:40:23 +0000
27+++ css/ie.css 2010-09-25 12:09:40 +0000
28@@ -45,7 +45,7 @@
29 /*- Typography
30 -------------------------------------------------------------------------------------------------------- */
31
32-body { font-family: Helvetica,Arial,'Liberation Sans',FreeSans,sans-serif; font-size:100%; line-height:1.5em;}
33+body { font-family: Ubuntu, UbuntuBeta, 'Ubuntu Beta','Bitstream Vera Sans', 'DejaVu Sans', Tahoma, sans-serif; font-size:100%; line-height:1.5em;}
34 h1 { font-size:2.25em; /* 16x2.25 =36 */ }
35 h2 { font-size:1.5em; /* 16x1.5 =24 */ }
36 h3 { font-size:1.125em; /* 16x1.125=18 */ }
37@@ -139,8 +139,8 @@
38
39
40 body { background:url("../images/dotted.png") repeat scroll 0 0 #FFFFFF; color:#333333; }
41-#page-header { background:url("../images/header.png") repeat-x scroll 0 0 #EF5A29; height:72px; }
42-#page-header .container { background:url("../images/header.png") repeat-x scroll 0 0 #EF5A29; }
43+#page-header { background:url("../images/header.png") repeat-x scroll 0 0 #dd4814; height:70px; }
44+#page-header .container { background:url("../images/header.png") repeat-x scroll 0 0 #dd4814; }
45 #top-logo { color:#fff; line-height:1.5em; text-align:right; }
46 #the-logo { padding-left:4px; }
47 #loco { clear:both; display:block; float:right;}
48
49=== modified file 'css/ie6.css'
50--- css/ie6.css 2010-09-24 23:40:23 +0000
51+++ css/ie6.css 2010-09-25 12:09:40 +0000
52@@ -44,7 +44,7 @@
53 /*- Typography
54 -------------------------------------------------------------------------------------------------------- */
55
56-body { font-family: Helvetica,Arial,'Liberation Sans',FreeSans,sans-serif; font-size:100%; line-height:1.5em;}
57+body { font-family: Ubuntu, UbuntuBeta, 'Ubuntu Beta','Bitstream Vera Sans', 'DejaVu Sans', Tahoma, sans-serif; font-size:100%; line-height:1.5em;}
58 h1 { font-size:2.25em; /* 16x2.25 =36 */ }
59 h2 { font-size:1.5em; /* 16x1.5 =24 */ }
60 h3 { font-size:1.125em; /* 16x1.125=18 */ }
61@@ -135,8 +135,8 @@
62
63
64 body { background:url("../images/dotted.png") repeat scroll 0 0 #FFFFFF; color:#333333; }
65-#page-header { background:url("../images/header.png") repeat-x scroll 0 0 #EF5A29; height:72px; }
66-#page-header .container { background:url("../images/header.png") repeat-x scroll 0 0 #EF5A29; }
67+#page-header { background:url("../images/header.png") repeat-x scroll 0 0 #dd4814; height:70px; }
68+#page-header .container { background:url("../images/header.png") repeat-x scroll 0 0 #dd4814; }
69 #top-logo { color:#fff; line-height:1.5em; text-align:right; }
70 #the-logo { padding-left:4px; }
71 #loco { display:inline; clear:both; float:right;}
72
73=== modified file 'css/wireframe-default.css'
74--- css/wireframe-default.css 2010-06-11 16:27:03 +0000
75+++ css/wireframe-default.css 2010-09-25 12:09:40 +0000
76@@ -44,7 +44,7 @@
77 /*- Typography
78 -------------------------------------------------------------------------------------------------------- */
79
80-body { font-family: Helvetica,Arial,'Liberation Sans',FreeSans,sans-serif; font-size:100%; line-height:1.5em;}
81+body { font-family: Ubuntu, UbuntuBeta, 'Ubuntu Beta','Bitstream Vera Sans', 'DejaVu Sans', Tahoma, sans-serif; font-size:100%; line-height:1.5em;}
82 h1 { font-size:2.25em; /* 16x2.25 =36 */ }
83 h2 { font-size:1.5em; /* 16x1.5 =24 */ }
84 h3 { font-size:1.125em; /* 16x1.125=18 */ }
85
86=== modified file 'css/wireframe-ie.css'
87--- css/wireframe-ie.css 2010-06-11 16:27:03 +0000
88+++ css/wireframe-ie.css 2010-09-25 12:09:40 +0000
89@@ -44,7 +44,7 @@
90 /*- Typography
91 -------------------------------------------------------------------------------------------------------- */
92
93-body { font-family: Helvetica,Arial,'Liberation Sans',FreeSans,sans-serif; font-size:100%; line-height:1.5em;}
94+body { font-family: Ubuntu, UbuntuBeta, 'Ubuntu Beta','Bitstream Vera Sans', 'DejaVu Sans', Tahoma, sans-serif; font-size:100%; line-height:1.5em;}
95 h1 { font-size:2.25em; /* 16x2.25 =36 */ }
96 h2 { font-size:1.5em; /* 16x1.5 =24 */ }
97 h3 { font-size:1.125em; /* 16x1.125=18 */ }
98
99=== modified file 'css/wireframe-ie6.css'
100--- css/wireframe-ie6.css 2010-06-11 16:27:03 +0000
101+++ css/wireframe-ie6.css 2010-09-25 12:09:40 +0000
102@@ -45,7 +45,7 @@
103 /*- Typography
104 -------------------------------------------------------------------------------------------------------- */
105
106-body { font-family: Helvetica,Arial,'Liberation Sans',FreeSans,sans-serif; font-size:100%; line-height:1.5em;}
107+body { font-family: Ubuntu, UbuntuBeta, 'Ubuntu Beta','Bitstream Vera Sans', 'DejaVu Sans', Tahoma, sans-serif; font-size:100%; line-height:1.5em;}
108 h1 { font-size:2.25em; /* 16x2.25 =36 */ }
109 h2 { font-size:1.5em; /* 16x1.5 =24 */ }
110 h3 { font-size:1.125em; /* 16x1.125=18 */ }
111
112=== modified file 'images/header.png'
113Binary files images/header.png 2010-05-28 21:09:23 +0000 and images/header.png 2010-09-25 12:09:40 +0000 differ

Subscribers

People subscribed via source and target branches