Ubuntu Website - OBSOLETE

Merge lp:~cjohnston/ubuntu-website/css-fixes-django into lp:~ubuntu-website-community/ubuntu-website/light-django-theme

  1. css-fixes-django
  2. Merge into light-django-theme
Proposed by Chris Johnston
Status: Merged
Approved by: Michael Hall
Approved revision: 25
Merged at revision: 25
Proposed branch: lp:~cjohnston/ubuntu-website/css-fixes-django
Merge into: lp:~ubuntu-website-community/ubuntu-website/light-django-theme
Diff against target: 74 lines (+9/-9)
3 files modified
media/css/default.css (+3/-3)
media/css/ie.css (+3/-3)
media/css/ie6.css (+3/-3)
To merge this branch: bzr merge lp:~cjohnston/ubuntu-website/css-fixes-django
Reviewer Review Type Date Requested Status
Michael Hall (community) Approve
Chris Johnston Pending
Review via email: mp+36880@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Michael Hall (mhall119) wrote :

Looks good.

review: Approve

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-07 12:20:13 +0000
3+++ media/css/default.css 2010-09-28 15:26:13 +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: 'Ubuntubeta','Ubuntu','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@@ -136,8 +136,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; color:#fff}
24
25=== modified file 'media/css/ie.css'
26--- media/css/ie.css 2010-09-24 23:48:43 +0000
27+++ media/css/ie.css 2010-09-28 15:26:13 +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: 'Ubuntubeta','Ubuntu','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 'media/css/ie6.css'
50--- media/css/ie6.css 2010-09-24 23:48:43 +0000
51+++ media/css/ie6.css 2010-09-28 15:26:13 +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: 'Ubuntubeta','Ubuntu','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 'media/images/header.png'
74Binary files media/images/header.png 2010-06-14 14:48:41 +0000 and media/images/header.png 2010-09-28 15:26:13 +0000 differ

Subscribers

People subscribed via source and target branches