Ubuntu Website - OBSOLETE

Merge lp:~mhall119/ubuntu-website/fixes-595621 into lp:~ubuntu-website-community/ubuntu-website/light-base-theme

  1. fixes-595621
  2. Merge into light-base-theme
Proposed by Michael Hall
Status: Merged
Approved by: Chris Johnston
Approved revision: 2
Merged at revision: 4
Proposed branch: lp:~mhall119/ubuntu-website/fixes-595621
Merge into: lp:~ubuntu-website-community/ubuntu-website/light-base-theme
Diff against target: 27 lines (+5/-5)
1 file modified
css/default.css (+5/-5)
To merge this branch: bzr merge lp:~mhall119/ubuntu-website/fixes-595621
Reviewer Review Type Date Requested Status
Chris Johnston Approve
Michael Lustfield (community) Approve
Review via email: mp+27868@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Michael Lustfield (michaellustfield) wrote :

I tested this and found no issues with it. The indentation in the css does make it painful to read though.

review: Approve
Revision history for this message
Chris Johnston (cjohnston) wrote :

Partially fixed issues. I completed the fix and merged them in.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'css/default.css'
--- css/default.css 2010-06-14 11:36:50 +0000
+++ css/default.css 2010-06-17 18:15:38 +0000
@@ -134,9 +134,9 @@
134h6 { color:#DD4814; }134h6 { color:#DD4814; }
135135
136136
137body { background:url("http://s.ubuntu.ru/dotted.png") repeat scroll 0 0 #FFFFFF; color:#333333; }137body { background:url("../images/dotted.png") repeat scroll 0 0 #FFFFFF; color:#333333; }
138#page-header { background:url("http://s.ubuntu.ru/header.png") repeat-x scroll 0 0 #EF5A29; height:72px; }138#page-header { background:url("../images/header.png") repeat-x scroll 0 0 #EF5A29; height:72px; }
139#page-header .container { background:url("http://s.ubuntu.ru/header.png") repeat-x scroll 0 0 #EF5A29; }139#page-header .container { background:url("../images/header.png") repeat-x scroll 0 0 #EF5A29; }
140#top-logo { color:#fff; line-height:1.5em; text-align:right; }140#top-logo { color:#fff; line-height:1.5em; text-align:right; }
141#the-logo { padding-left:4px; }141#the-logo { padding-left:4px; }
142#loco { clear:both; display:block; float:right;}142#loco { clear:both; display:block; float:right;}
@@ -238,8 +238,8 @@
238#login-widget { text-align:center;}238#login-widget { text-align:center;}
239239
240240
241#page-footer { background:url("http://s.ubuntu.ru/footer.png") repeat-x scroll 0 0 #EEECEA; }241#page-footer { background:url("../images/footer.png") repeat-x scroll 0 0 #EEECEA; }
242#page-footer .container { background:url("http://s.ubuntu.ru/footer.png") repeat-x scroll 0 0 #EEECEA; padding:0px 10px; width:960px; }242#page-footer .container { background:url("../images/footer.png") repeat-x scroll 0 0 #EEECEA; padding:0px 10px; width:960px; }
243.footer-content dd { margin-bottom:15px;}243.footer-content dd { margin-bottom:15px;}
244.footer-links { list-style:none; }244.footer-links { list-style:none; }
245.footer-item { border-bottom:1px dotted #333; display:block; margin-top:3px; }245.footer-item { border-bottom:1px dotted #333; display:block; margin-top:3px; }

Subscribers

People subscribed via source and target branches