Merge lp:~dust4ngel/osdf/drupal-theme into lp:~daimoneze/osdf/drupal7-theme

Proposed by kage
Status: Merged
Merged at revision: 6
Proposed branch: lp:~dust4ngel/osdf/drupal-theme
Merge into: lp:~daimoneze/osdf/drupal7-theme
Diff against target: 97 lines (+16/-58)
2 files modified
orange/css/osdf/layout.css (+16/-23)
orange/css/style.css (+0/-35)
To merge this branch: bzr merge lp:~dust4ngel/osdf/drupal-theme
Reviewer Review Type Date Requested Status
Toast McFarland Approve
Review via email: mp+60424@code.launchpad.net

Description of the change

refactored all of custom styling out of core theme stylesheet and into block configuration using 'block class', i.e. the custom CSS is no longer necessary as it can be managed through the admin UI.

To post a comment you must log in.
Revision history for this message
Toast McFarland (daimoneze) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'orange/css/osdf/layout.css'
--- orange/css/osdf/layout.css 2011-05-09 00:45:12 +0000
+++ orange/css/osdf/layout.css 2011-05-09 20:26:35 +0000
@@ -1,28 +1,13 @@
1/* block widths */1/* block widths (not specified in css/style.css */
2
3.width-75 {
4 width: 75%;
5 float: left;
6}
72
8.width-66 {3.width-66 {
9 width: 66%;4 width: 64%;
10 float: left;5 float: left;
11}6}
127
13.width-50 {8#content-top .width-66,
14 width: 50%;9#content-inner .width-66 {
15 float: left;10 width: 72%;
16}
17
18.width-33 {
19 width: 33%;
20 float: left;
21}
22
23.width-25 {
24 width: 25%;
25 float: left;
26}11}
2712
28/* block margins */13/* block margins */
@@ -42,3 +27,11 @@
42.margin-bottom {27.margin-bottom {
43 margin-bottom: 16px;28 margin-bottom: 16px;
44}29}
30
31/*
32 * view tables
33 */
34
35.views-table{
36 width:100%;
37 }
4538
=== modified file 'orange/css/style.css'
--- orange/css/style.css 2011-05-07 17:40:03 +0000
+++ orange/css/style.css 2011-05-09 20:26:35 +0000
@@ -1238,39 +1238,4 @@
1238 font-size: 0.9em;1238 font-size: 0.9em;
1239}1239}
12401240
1241/*
1242 *Start featured blocks
1243 */
1244div.region #block-views-featured-block {
1245 float:right;
1246}
1247
1248.region-content-inner {
1249 margin: 10px 0;
1250}
1251div div.region-content-inner #block-views-featured-post-block-1{
1252 margin-top:10px !important;
1253 width:390px;
1254}
1255
1256/*
1257 * Issue Tracker
1258 */
1259 div.view-issue-tracker table.views-table{
1260 width:100%;
1261 }
1262
1263 .view-members .views-table{
1264 width:100%;
1265 }
1266/*
1267 * Bottom content region
1268 */
1269.region-content-bottom{}
1270
1271.region-content-bottom .block{
1272 width:30%;
1273 margin: 0 10px;
1274 float:left;
1275}
1276/* @end */1241/* @end */
1277\ No newline at end of file1242\ No newline at end of file

Subscribers

People subscribed via source and target branches

to all changes: