Quam Plures

Merge lp:~edb/quam-plures/fixing_floats_stuff into lp:quam-plures

  1. fixing_floats_stuff
  2. Merge into trunk
Proposed by EdB
Status: Merged
Merged at revision: 7583
Proposed branch: lp:~edb/quam-plures/fixing_floats_stuff
Merge into: lp:quam-plures
Diff against target: 249 lines (+38/-37)
7 files modified
qp_templates/evocamp/_item_block.inc.php (+3/-1)
qp_templates/glossyblue/style.css (+4/-2)
qp_templates/intense/style.css (+16/-17)
qp_templates/photoblog/style.css (+9/-16)
qp_templates/pixelgreen/style.css (+1/-0)
qp_templates/pluralism/style.css (+4/-0)
qp_templates/vastitude/style.css (+1/-1)
To merge this branch: bzr merge lp:~edb/quam-plures/fixing_floats_stuff
Reviewer Review Type Date Requested Status
Yabs (community) Approve
Review via email: mp+45898@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Yabs (yabs) wrote :

I'm the wrong person to be reviewing style stuff, but it looks like it should work.

Using .bPost{ overflow:auto} 8should* have a similar effect

¥

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'qp_templates/evocamp/_item_block.inc.php'
2--- qp_templates/evocamp/_item_block.inc.php 2010-12-31 12:12:03 +0000
3+++ qp_templates/evocamp/_item_block.inc.php 2011-01-11 18:40:37 +0000
4@@ -86,7 +86,9 @@
5 // --- --- --- --- --- --- --- --- --- --- ---
6 // --- POST CONTENT INCLUDED HERE ---
7 template_include( '_item_content.inc.php', $params );
8-
9+?>
10+<div class="clear"></div>
11+<?php
12 // display the item's tags
13 $Item->tags( array(
14 'before' => '<div class="posttags">'.$Template->T_('Tags').': ',
15
16=== modified file 'qp_templates/glossyblue/style.css'
17--- qp_templates/glossyblue/style.css 2010-08-03 11:03:54 +0000
18+++ qp_templates/glossyblue/style.css 2011-01-11 18:40:37 +0000
19@@ -181,14 +181,17 @@
20 /* content area */
21 #content {
22 padding: 10px 0 30px 20px;
23+ clear:both;
24 float: left;
25 width: 485px;
26- overflow: hidden;
27 }
28 .post {
29 clear:both;
30 padding-top: 15px;
31 }
32+.bText {
33+overflow: inherit;
34+}
35 .post-date {
36 width: 45px;
37 height: 49px;
38@@ -234,7 +237,6 @@
39 }
40
41 .entry {
42- clear: both;
43 padding-top: 10px;
44 }
45 .post-cat {
46
47=== modified file 'qp_templates/intense/style.css'
48--- qp_templates/intense/style.css 2010-07-25 18:05:13 +0000
49+++ qp_templates/intense/style.css 2011-01-11 18:40:37 +0000
50@@ -252,7 +252,7 @@
51 }
52
53 /* menubar */
54-.nav{
55+.nav {
56 height:40px;
57 background-color:#222;
58 color:#fff;
59@@ -262,7 +262,7 @@
60 font-size:11px;
61 text-transform:lowercase;
62 }
63-.nav2{
64+.nav2 {
65 height:40px;
66 }
67 #slogan{
68@@ -271,33 +271,32 @@
69 font-size:1.1em;
70 font-style:italic;
71 }
72-#navdiv{
73+#navdiv {
74 text-align:right;
75 }
76-#navlist
77-{
78+#navlist {
79 font-size:120%;
80 list-style-type:none;
81 margin:0px;
82 padding:10px 8px 2px 0;
83 font-family: Trebuchet MS, Arial, Serif;
84 }
85-#navlist li{
86+#navlist li {
87 display:inline;
88 }
89-#navlist li a{
90+#navlist li a {
91 color:#999;
92 font-weight:bold;
93 text-decoration:none;
94 height:40px;
95 padding:10px 6px;
96 }
97-#navlist li a:hover,#navlist li a:active, #navlist li.current_page_item a{
98+#navlist li a:hover,#navlist li a:active, #navlist li.current_page_item a {
99 color:#fff;
100 }
101
102 /* content */
103-#content{
104+#content {
105 width:440px;
106 float:left;
107 padding:10px 10px 30px 20px;
108@@ -305,29 +304,29 @@
109 * html #content{
110 padding-top:20px;
111 }
112-#content .post
113-{
114+#content .post {
115 margin:0 0 3em 0;
116 }
117-#content .cat
118-{
119+#content .cat {
120 margin:0;
121 padding:0;
122 color:#999;
123 }
124-#content .post-info
125-{
126+#content .post-info {
127 color:#777;
128 text-align:right;
129 background:url(rsc/img/dottedborder.gif) repeat-x top;
130 }
131-#content .post-info em
132-{
133+#content .post-info em {
134 font-style:normal;
135 float:left;
136 margin:0 5px 0 0;
137 }
138
139+.postmetadata {
140+ clear: both;
141+}
142+
143 /* sidebar */
144
145 #sidebar {
146
147=== modified file 'qp_templates/photoblog/style.css'
148--- qp_templates/photoblog/style.css 2010-07-25 18:05:13 +0000
149+++ qp_templates/photoblog/style.css 2011-01-11 18:40:37 +0000
150@@ -95,30 +95,25 @@
151 margin: 0 2ex;
152 }
153
154-.nav_right img
155-{
156+.nav_right img {
157 vertical-align: top;
158 }
159-.nav_right a
160-{
161+.nav_right a {
162 display: block;
163 margin: 1ex 0;
164 float: right;
165 border: 1px solid #666;
166 }
167-.nav_right a:hover
168-{
169+.nav_right a:hover {
170 border: 1px solid #fff;
171 }
172-img.no_nav
173-{
174+img.no_nav {
175 margin: 1ex 0;
176 float: right;
177 border: 1px solid #666;
178 }
179
180-.bPost
181-{
182+.bPost {
183 clear: both;
184 }
185 div.image_block img {
186@@ -141,19 +136,17 @@
187 margin: 0;
188 padding: 0 12px;
189 }
190-.bSmallHead
191-{
192+.bSmallHead {
193 margin: 0;
194 padding: 12px 12px 6px 12px;
195 }
196-.bSmallPrint
197-{
198+.bSmallPrint {
199+ clear: both;
200 margin: 0;
201 font-size: 84%;
202 padding: 6px 12px 12px 12px;
203 }
204-.action_right
205-{
206+.action_right {
207 font-size: 84%;
208 float: right;
209 margin: 0 0 0 1em;
210
211=== modified file 'qp_templates/pixelgreen/style.css'
212--- qp_templates/pixelgreen/style.css 2010-07-25 18:05:13 +0000
213+++ qp_templates/pixelgreen/style.css 2011-01-11 18:40:37 +0000
214@@ -307,6 +307,7 @@
215 border: 1px solid #EFEDED;
216 }
217 .post .post-footer {
218+ clear: both;
219 background-color: #FAFAFA;
220 border: 1px solid #f2f2f2;
221 padding: 5px;
222
223=== modified file 'qp_templates/pluralism/style.css'
224--- qp_templates/pluralism/style.css 2010-07-25 18:05:13 +0000
225+++ qp_templates/pluralism/style.css 2011-01-11 18:40:37 +0000
226@@ -282,6 +282,10 @@
227 text-decoration: underline;
228 }
229
230+.postmetadata {
231+ clear: both;
232+}
233+
234 /* Navigation */
235
236 .navigation {
237
238=== modified file 'qp_templates/vastitude/style.css'
239--- qp_templates/vastitude/style.css 2010-08-03 11:03:54 +0000
240+++ qp_templates/vastitude/style.css 2011-01-11 18:40:37 +0000
241@@ -126,7 +126,7 @@
242 div.head {padding-bottom:5px;}
243 div.bSmallHead {font-size:0.9em; margin:-5px 0 15px 0;}
244 div.bSmallHead img {padding-bottom:2px;}
245-div.bSmallPrint {font-size:0.8em;margin-bottom:20px;padding:20px 0 5px; border-bottom:1px solid #9e7d55;}
246+div.bSmallPrint {clear:both;font-size:0.8em;margin-bottom:20px;padding:20px 0 5px; border-bottom:1px solid #9e7d55;}
247 html>body div.bSmallPrint {margin-bottom:30px;padding-bottom:5px;}
248 div.bSmallPrint a img {margin-bottom:0px;margin-right:4px;}
249 a.permalink_right {float:right;}

Subscribers

People subscribed via source and target branches