Ubuntu Website - OBSOLETE

Merge lp:~cjohnston/ubuntu-website/bug-595621-django into lp:~ubuntu-website-community/ubuntu-website/light-django-theme

  1. bug-595621-django
  2. Merge into light-django-theme
Proposed by Chris Johnston
Status: Merged
Approved by: Michael Hall
Approved revision: 24
Merged at revision: 24
Proposed branch: lp:~cjohnston/ubuntu-website/bug-595621-django
Merge into: lp:~ubuntu-website-community/ubuntu-website/light-django-theme
Diff against target: 55 lines (+10/-10)
2 files modified
media/css/ie.css (+5/-5)
media/css/ie6.css (+5/-5)
To merge this branch: bzr merge lp:~cjohnston/ubuntu-website/bug-595621-django
Reviewer Review Type Date Requested Status
Chris Johnston Pending
Review via email: mp+36611@code.launchpad.net
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 'media/css/ie.css'
2--- media/css/ie.css 2010-06-17 18:28:26 +0000
3+++ media/css/ie.css 2010-09-24 23:53:39 +0000
4@@ -138,9 +138,9 @@
5 h6 { color:#DD4814; }
6
7
8-body { background:url("http://s.ubuntu.ru/dotted.png") repeat scroll 0 0 #FFFFFF; color:#333333; }
9-#page-header { background:url("http://s.ubuntu.ru/header.png") repeat-x scroll 0 0 #EF5A29; height:72px; }
10-#page-header .container { background:url("http://s.ubuntu.ru/header.png") repeat-x scroll 0 0 #EF5A29; }
11+body { background:url("../images/dotted.png") repeat scroll 0 0 #FFFFFF; color:#333333; }
12+#page-header { background:url("../images/header.png") repeat-x scroll 0 0 #EF5A29; height:72px; }
13+#page-header .container { background:url("../images/header.png") repeat-x scroll 0 0 #EF5A29; }
14 #top-logo { color:#fff; line-height:1.5em; text-align:right; }
15 #the-logo { padding-left:4px; }
16 #loco { clear:both; display:block; float:right;}
17@@ -241,8 +241,8 @@
18
19 #login-widget { text-align:center;}
20
21-#page-footer { background:url("http://s.ubuntu.ru/footer.png") repeat-x scroll 0 0 #EEECEA; }
22-#page-footer .container { background:url("http://s.ubuntu.ru/footer.png") repeat-x scroll 0 0 #EEECEA; padding:0px 10px; width:960px; }
23+#page-footer { background:url("../images/footer.png") repeat-x scroll 0 0 #EEECEA; }
24+#page-footer .container { background:url("../images/footer.png") repeat-x scroll 0 0 #EEECEA; padding:0px 10px; width:960px; }
25 .footer-content dd { margin-bottom:15px;}
26 .footer-links { list-style:none; text-indent:0px; list-style-position:outside; }
27 .footer-item { border-bottom:1px dotted #333; display:block; margin-top:3px; }
28
29=== modified file 'media/css/ie6.css'
30--- media/css/ie6.css 2010-06-17 18:28:26 +0000
31+++ media/css/ie6.css 2010-09-24 23:53:39 +0000
32@@ -134,9 +134,9 @@
33 h6 { color:#DD4814; }
34
35
36-body { background:url("http://s.ubuntu.ru/dotted.png") repeat scroll 0 0 #FFFFFF; color:#333333; }
37-#page-header { background:url("http://s.ubuntu.ru/header.png") repeat-x scroll 0 0 #EF5A29; height:72px; }
38-#page-header .container { background:url("http://s.ubuntu.ru/header.png") repeat-x scroll 0 0 #EF5A29; }
39+body { background:url("../images/dotted.png") repeat scroll 0 0 #FFFFFF; color:#333333; }
40+#page-header { background:url("../images/header.png") repeat-x scroll 0 0 #EF5A29; height:72px; }
41+#page-header .container { background:url("../images/header.png") repeat-x scroll 0 0 #EF5A29; }
42 #top-logo { color:#fff; line-height:1.5em; text-align:right; }
43 #the-logo { padding-left:4px; }
44 #loco { display:inline; clear:both; float:right;}
45@@ -243,8 +243,8 @@
46
47
48
49-#page-footer { background:url("http://s.ubuntu.ru/footer.png") repeat-x scroll 0 0 #EEECEA; }
50-#page-footer .container { background:url("http://s.ubuntu.ru/footer.png") repeat-x scroll 0 0 #EEECEA; padding:0px 10px; width:960px; }
51+#page-footer { background:url("../images/footer.png") repeat-x scroll 0 0 #EEECEA; }
52+#page-footer .container { background:url("../images/footer.png") repeat-x scroll 0 0 #EEECEA; padding:0px 10px; width:960px; }
53
54 .footer-content dd { margin-bottom:15px;}
55 .footer-links { list-style:none; text-indent:0px; list-style-position:outside; }

Subscribers

People subscribed via source and target branches