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
1=== modified file 'orange/css/osdf/layout.css'
2--- orange/css/osdf/layout.css 2011-05-09 00:45:12 +0000
3+++ orange/css/osdf/layout.css 2011-05-09 20:26:35 +0000
4@@ -1,28 +1,13 @@
5-/* block widths */
6-
7-.width-75 {
8- width: 75%;
9- float: left;
10-}
11+/* block widths (not specified in css/style.css */
12
13 .width-66 {
14- width: 66%;
15- float: left;
16-}
17-
18-.width-50 {
19- width: 50%;
20- float: left;
21-}
22-
23-.width-33 {
24- width: 33%;
25- float: left;
26-}
27-
28-.width-25 {
29- width: 25%;
30- float: left;
31+ width: 64%;
32+ float: left;
33+}
34+
35+#content-top .width-66,
36+#content-inner .width-66 {
37+ width: 72%;
38 }
39
40 /* block margins */
41@@ -42,3 +27,11 @@
42 .margin-bottom {
43 margin-bottom: 16px;
44 }
45+
46+/*
47+ * view tables
48+ */
49+
50+.views-table{
51+ width:100%;
52+ }
53
54=== modified file 'orange/css/style.css'
55--- orange/css/style.css 2011-05-07 17:40:03 +0000
56+++ orange/css/style.css 2011-05-09 20:26:35 +0000
57@@ -1238,39 +1238,4 @@
58 font-size: 0.9em;
59 }
60
61-/*
62- *Start featured blocks
63- */
64-div.region #block-views-featured-block {
65- float:right;
66-}
67-
68-.region-content-inner {
69- margin: 10px 0;
70-}
71-div div.region-content-inner #block-views-featured-post-block-1{
72- margin-top:10px !important;
73- width:390px;
74-}
75-
76-/*
77- * Issue Tracker
78- */
79- div.view-issue-tracker table.views-table{
80- width:100%;
81- }
82-
83- .view-members .views-table{
84- width:100%;
85- }
86-/*
87- * Bottom content region
88- */
89-.region-content-bottom{}
90-
91-.region-content-bottom .block{
92- width:30%;
93- margin: 0 10px;
94- float:left;
95-}
96 /* @end */
97\ No newline at end of file

Subscribers

People subscribed via source and target branches

to all changes: