Ubuntu Website - OBSOLETE

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

  1. django-css-guidelines
  2. Merge into light-django-theme
Proposed by Chris Johnston
Status: Merged
Merged at revision: 28
Proposed branch: lp:~cjohnston/ubuntu-website/django-css-guidelines
Merge into: lp:~ubuntu-website-community/ubuntu-website/light-django-theme
Diff against target: 115 lines (+22/-10)
3 files modified
media/css/default.css (+8/-5)
media/css/ie.css (+7/-2)
media/css/ie6.css (+7/-3)
To merge this branch: bzr merge lp:~cjohnston/ubuntu-website/django-css-guidelines
Reviewer Review Type Date Requested Status
Chris Johnston Pending
Review via email: mp+36930@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/default.css'
2--- media/css/default.css 2010-09-28 18:50:30 +0000
3+++ media/css/default.css 2010-09-28 21:35:52 +0000
4@@ -29,7 +29,7 @@
5 nav ul { list-style:none; }
6 blockquote, q { quotes:none; }
7 blockquote:before, blockquote:after, q:before, q:after { content:''; }
8-a { cursor:pointer; margin:0; padding:0; border:0; font-size:100%; vertical-align:baseline; background:transparent; text-decoration:none; }
9+a { cursor:pointer; margin:0; padding:0; border:0; font-size:100%; color: #DD4814; vertical-align:baseline; background:transparent; text-decoration:none; }
10 ins { background-color:#ff9; color:#000; text-decoration:none; }
11 mark { background-color:#ff9; color:#000; font-style:italic; font-weight:bold; }
12 del { text-decoration: line-through; }
13@@ -54,10 +54,8 @@
14 h1 {
15 font-size: 36px;
16 line-height: 40px;
17-
18 margin-top: 0px;
19 margin-bottom: 0px;
20-
21 }
22
23 h2 {
24@@ -82,8 +80,8 @@
25 }
26
27 dt { font-size:0.75em; font-weight:bold; /* 16x0.75 =12 */ }
28-li { font-size:0.75em; line-height:1.5em; /* 16x0.75=12 */ }
29-td li, li li { font-size:100%; line-height:100%; /* reset */ }
30+li { font-size: 12px; line-height: 16px; }
31+td li, li li { font-size: 12px; line-height: 16px; }
32 strong { font-weight:bold;}
33 em { font-style:italic; }
34 #top-logo { font-size:0.875em; /* 16x0.75 =12 */}
35@@ -264,6 +262,11 @@
36
37 #page-footer { background:url("../images/footer.png") repeat-x scroll 0 0 #EEECEA; }
38 #page-footer .container { background:url("../images/footer.png") repeat-x scroll 0 0 #EEECEA; padding:0px 10px; width:960px; }
39+#page-footer .container div.copyright {
40+ font-size: 10px;
41+ line-height: 14px;
42+ color: #aea79f;
43+}
44 .footer-content dd { margin-bottom:15px;}
45 .footer-links { list-style:none; }
46 .footer-item { border-bottom:1px dotted #333; display:block; margin-top:3px; }
47
48=== modified file 'media/css/ie.css'
49--- media/css/ie.css 2010-09-28 18:50:30 +0000
50+++ media/css/ie.css 2010-09-28 21:35:52 +0000
51@@ -30,7 +30,7 @@
52 nav ul { list-style:none; }
53 blockquote, q { quotes:none; }
54 blockquote:before, blockquote:after, q:before, q:after { content:''; }
55-a { cursor:pointer; margin:0; padding:0; border:0; font-size:100%; vertical-align:baseline; background:transparent; text-decoration:none; }
56+a { cursor:pointer; margin:0; padding:0; border:0; font-size:100%; color: #DD4814; vertical-align:baseline; background:transparent; text-decoration:none; }
57 ins { background-color:#ff9; color:#000; text-decoration:none; }
58 mark { background-color:#ff9; color:#000; font-style:italic; font-weight:bold; }
59 del { text-decoration: line-through; }
60@@ -83,7 +83,7 @@
61 }
62
63 dt { font-size:0.75em; font-weight:bold; /* 16x0.75 =12 */ }
64-li { font-size:0.75em; line-height:1.5em; /* 16x0.75=12 */ }
65+li { font-size: 12px; line-height: 16px; }
66 strong { font-weight:bold;}
67 em { font-style:italic; }
68 #top-logo { font-size:0.875em; /* 16x0.75 =12 */}
69@@ -264,6 +264,11 @@
70
71 #page-footer { background:url("../images/footer.png") repeat-x scroll 0 0 #EEECEA; }
72 #page-footer .container { background:url("../images/footer.png") repeat-x scroll 0 0 #EEECEA; padding:0px 10px; width:960px; }
73+#page-footer .container div.copyright {
74+ font-size: 10px;
75+ line-height: 14px;
76+ color: #aea79f;
77+}
78 .footer-content dd { margin-bottom:15px;}
79 .footer-links { list-style:none; text-indent:0px; list-style-position:outside; }
80 .footer-item { border-bottom:1px dotted #333; display:block; margin-top:3px; }
81
82=== modified file 'media/css/ie6.css'
83--- media/css/ie6.css 2010-09-28 18:50:30 +0000
84+++ media/css/ie6.css 2010-09-28 21:35:52 +0000
85@@ -29,7 +29,7 @@
86 nav ul { list-style:none; }
87 blockquote, q { quotes:none; }
88 blockquote:before, blockquote:after, q:before, q:after { content:''; }
89-a { cursor:pointer; margin:0; padding:0; border:0; font-size:100%; vertical-align:baseline; background:transparent; text-decoration:none; }
90+a { cursor:pointer; margin:0; padding:0; border:0; font-size:100%; color: #DD4814; vertical-align:baseline; background:transparent; text-decoration:none; }
91 ins { background-color:#ff9; color:#000; text-decoration:none; }
92 mark { background-color:#ff9; color:#000; font-style:italic; font-weight:bold; }
93 del { text-decoration: line-through; }
94@@ -82,7 +82,7 @@
95 }
96
97 dt { font-size:0.75em; font-weight:bold; /* 16x0.75 =12 */ }
98-li { font-size:0.75em; line-height:1.5em; /* 16x0.75=12 */ }
99+li { font-size: 12px; line-height: 16px; }
100 strong { font-weight:bold;}
101 em { font-style:italic; }
102 #top-logo { font-size:0.875em; /* 16x0.75 =12 */}
103@@ -267,7 +267,11 @@
104
105 #page-footer { background:url("../images/footer.png") repeat-x scroll 0 0 #EEECEA; }
106 #page-footer .container { background:url("../images/footer.png") repeat-x scroll 0 0 #EEECEA; padding:0px 10px; width:960px; }
107-
108+#page-footer .container div.copyright {
109+ font-size: 10px;
110+ line-height: 14px;
111+ color: #aea79f;
112+}
113 .footer-content dd { margin-bottom:15px;}
114 .footer-links { list-style:none; text-indent:0px; list-style-position:outside; }
115 .footer-item { border-bottom:1px dotted #333; display:block; margin-top:3px; }

Subscribers

People subscribed via source and target branches