Summit

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

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

Subscribers

People subscribed via source and target branches