Merge lp:~cjohnston/summit/css-fixes into lp:summit

Proposed by Chris Johnston
Status: Merged
Approved by: Michael Hall
Approved revision: 40
Merged at revision: 39
Proposed branch: lp:~cjohnston/summit/css-fixes
Merge into: lp:summit
Diff against target: 196 lines (+0/-168)
3 files modified
summit/media/css/chrome.css (+0/-148)
summit/media/css/schedule.css (+0/-13)
summit/media/css/style.css (+0/-7)
To merge this branch: bzr merge lp:~cjohnston/summit/css-fixes
Reviewer Review Type Date Requested Status
Summit Hackers Pending
Review via email: mp+37598@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Alan Bell (alanbell) wrote :

looks good to me, this will let the ubuntu font and other features shine through from the light-django-theme

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'summit/media/css/chrome.css'
2--- summit/media/css/chrome.css 2010-03-05 10:33:36 +0000
3+++ summit/media/css/chrome.css 2010-10-05 13:37:45 +0000
4@@ -1,153 +1,5 @@
5 /* CSS for entire page style, border, etc. */
6
7-body {
8- background-image: url(../img/bgrepeat.jpg);
9- background-color: #D3CAAA;
10- background-repeat: repeat-x;
11- padding: 0;
12- margin: 0;
13-}
14-
15-#container {
16- margin: 0 auto;
17- padding: 0 0 0 14px;
18- position: absolute;
19- background-color: #fff;
20- background-image: url(../img/page-border-left-repeat.jpg);
21- background-repeat: repeat-y;
22- background-position: left;
23- /*max-width: 950px;*/
24- min-width: 760px;
25-}
26-
27-#content {
28- margin: 0;
29- padding: 0 13px 0 0;
30- min-height: 665px;
31- position: relative;
32- background-color: #fff;
33- background-image: url(../img/page-border-right-repeat.jpg);
34- background-repeat: repeat-y;
35- background-position: right;
36-}
37-
38-
39-#topNav {
40- width: 100%;
41- position: relative;
42- height: 70px;
43-
44- background-image: url(../img/top.jpg);
45- background-repeat: repeat-x;
46- background-position: top;
47- padding-top: 10px;
48- z-index: 1;
49-}
50-
51-#topNav a {
52- color: #656565;
53- text-decoration: none;
54- font-size: 80%;
55- border-bottom: 1px dotted #fff;
56-}
57-
58-#topNav #whoami {
59- display: block;
60- margin: 0;
61- padding: 0 0px .5em 0px;
62- position: absolute;
63- top: 20px;
64- right: 0px;
65-}
66-
67-#topNav #ubuntulogo {
68- margin: 0;
69- padding: 0;
70- border-style: none;
71-
72- position: absolute;
73- top: 22px;
74- left: 0;
75-}
76-
77-
78-#bg-left {
79- position: absolute;
80- top: 0;
81- left: 0;
82- width: 14px;
83- height: 665px;
84- background-image: url(../img/page-border-left.jpg);
85- background-repeat: no-repeat;
86- background-position: top left;
87- z-index: 6;
88-}
89-
90-#bg-right {
91- position: absolute;
92- top: 0;
93- right: 0;
94- width: 13px;
95- height: 665px;
96- background-image: url(../img/page-border-right.jpg);
97- background-repeat: no-repeat;
98- background-position: top right;
99- z-index: 6;
100-}
101-
102-#bottom-left {
103- width: 14px;
104- height: 34px;
105- background-image: url(../img/footerbg-left.jpg);
106- position: absolute;
107- bottom: 0;
108- left: 0;
109- z-index: 7;
110-}
111-
112-#bottom-right {
113- width: 13px;
114- height: 34px;
115- background-image: url(../img/footerbg-right.jpg);
116- position: absolute;
117- bottom: 0;
118- right: 0;
119- z-index: 7;
120-}
121-
122-
123-#body {
124- position: relative;
125- margin: 0 0;
126- padding: 0 50px;
127- min-height: 538px;
128-}
129-
130-* html #body {
131- height: 1%;
132-}
133-
134-
135-#footer {
136- background-image: url(../img/footerbg.jpg);
137- background-repeat: repeat-x;
138- background-position: bottom;
139- padding: 0 0 0 0;
140-}
141-
142-#footer .wrapper {
143- padding: 0 15px 15px 15px;
144- color: #656565;
145- font-size: 70%;
146- position: relative;
147-}
148-
149-#footer .wrapper p {
150- width: 70%;
151- font-size: 90%;
152-}
153-
154-
155 .rule {
156 margin: 0 auto;
157 clear: both;
158
159=== modified file 'summit/media/css/schedule.css'
160--- summit/media/css/schedule.css 2010-10-03 19:35:52 +0000
161+++ summit/media/css/schedule.css 2010-10-05 13:37:45 +0000
162@@ -1,19 +1,6 @@
163 /* General formatting: we use lots of hyperlinks, but we don't want them
164 * to look like hyperlinks until we hover over them.
165 */
166-a {
167- text-decoration: none;
168- color: inherit;
169-}
170-
171-a:hover {
172- text-decoration: none;
173-}
174-
175-a img {
176- border: 0;
177-}
178-
179
180 .editlink {
181 float: right;
182
183=== modified file 'summit/media/css/style.css'
184--- summit/media/css/style.css 2010-03-05 10:33:36 +0000
185+++ summit/media/css/style.css 2010-10-05 13:37:45 +0000
186@@ -1,10 +1,3 @@
187-/* Style */
188-
189-body {
190- font-family: "Arial", "Helvetica", "Verdana", sans-serif;
191-}
192-
193-
194 /* System messages */
195 ul.messagelist {
196 margin-left: -30px;

Subscribers

People subscribed via source and target branches