### Eclipse Workspace Patch 1.0
#P drupal
Index: themes/bluemarine/page.tpl.php
===================================================================
RCS file: /cvs/drupal/drupal/themes/bluemarine/page.tpl.php,v
retrieving revision 1.28
diff -u -r1.28 page.tpl.php
--- themes/bluemarine/page.tpl.php 24 Jan 2008 09:42:52 -0000 1.28
+++ themes/bluemarine/page.tpl.php 6 May 2008 22:53:51 -0000
@@ -11,53 +11,45 @@
-
+
+
+
+
+
+
+
+
Index: themes/bluemarine/style.css
===================================================================
RCS file: /cvs/drupal/drupal/themes/bluemarine/style.css,v
retrieving revision 1.23
diff -u -r1.23 style.css
--- themes/bluemarine/style.css 17 Dec 2007 15:05:09 -0000 1.23
+++ themes/bluemarine/style.css 6 May 2008 22:53:52 -0000
@@ -52,10 +52,6 @@
font-size: 12px;
border: 1px solid #ddd;
}
-table {
- /* make | sizes relative to body size! */
- font-size: 1em;
-}
.form-item label {
font-size: 1em;
color: #222;
@@ -74,29 +70,94 @@
/*
** Page layout blocks / IDs
*/
-#header, #content {
+
+body {
+ min-width: 56em;
+ /* Background color needed to fill the sidebars for the length of the page. */
+ background-color: #ddd;
+}
+
+.layout-columns {
+ padding: 0 18em;
+}
+
+.sidebar-left .layout-columns {
+ padding-right: 0;
+}
+
+.sidebar-right .layout-columns {
+ padding-left: 0;
+}
+
+.layout-columns .column {
+ position: relative;
+ float: left; /* LTR */
+}
+
+#main {
width: 100%;
+ background-color: #fff;
+}
+#main .inner {
+ padding: 1em 1.5em 3em 1.5em;
+}
+
+#sidebar-left, #sidebar-right {
+ width: 16em;
+ padding: 1em;
+ margin-right: -18em; /* LTR */
+ background-color: #ddd;
+}
+
+#sidebar-left {
+ right: 18em; /* LTR */
}
+
#header {
+ padding: .2em;
background-color: #69c;
}
-#logo {
- vertical-align: middle;
- border: 0;
-}
-#logo img {
+.logo {
float: left; /* LTR */
padding: 0 1em;
border: 0;
}
+.site-name {
+ margin: 0.6em 0 0 ;
+ font-size: 2em;
+ white-space: nowrap;
+}
+.site-name a:link, .site-name a:visited {
+ color: #fff;
+}
+.site-name a:hover {
+ color: #369;
+ text-decoration: none;
+}
+.site-slogan {
+ font-size: 1em;
+ color: #eee;
+ display: block;
+ margin: 0;
+ font-style: italic;
+ font-weight: bold;
+}
+.search-box {
+ float: right; /* LTR */
+ margin: 1em;
+}
#menu {
padding: 0.5em 0.5em 0 0.5em; /* LTR */
text-align: right; /* LTR */
vertical-align: middle;
}
+#header-region {
+ clear: both;
+}
+
#navlist {
font-size: 1.0em;
- padding: 0 0.8em 1.2em 0; /* LTR */
+ padding: 0 0.8em 0.5em 0; /* LTR */
color: #9cf;
}
#navlist a {
@@ -137,30 +198,6 @@
color: #9cf;
font-weight: bold;
}
-.site-name {
- margin: 0.6em 0 0 ;
- padding: 0;
- font-size: 2em;
-}
-.site-name a:link, .site-name a:visited {
- color: #fff;
-}
-.site-name a:hover {
- color: #369;
- text-decoration: none;
-}
-.site-slogan {
- font-size: 1em;
- color: #eee;
- display: block;
- margin: 0;
- font-style: italic;
- font-weight: bold;
-}
-#main {
- /* padding in px not ex because IE messes up 100% width tables otherwise */
- padding: 10px;
-}
#mission, .node .content, .comment .content {
line-height: 1.4em;
}
@@ -180,17 +217,12 @@
.error {
border-color: red;
}
-#sidebar-left, #sidebar-right {
- background-color: #ddd;
- width: 16em;
- /* padding in px not ex because IE messes up 100% width tables otherwise */
- padding: 10px;
- vertical-align: top;
-}
+
#footer {
background-color: #eee;
padding: 1em;
font-size: 0.8em;
+ clear: both;
}
/*
Index: themes/bluemarine/style-rtl.css
===================================================================
RCS file: /cvs/drupal/drupal/themes/bluemarine/style-rtl.css,v
retrieving revision 1.5
diff -u -r1.5 style-rtl.css
--- themes/bluemarine/style-rtl.css 17 Dec 2007 15:05:09 -0000 1.5
+++ themes/bluemarine/style-rtl.css 6 May 2008 22:53:51 -0000
@@ -2,9 +2,22 @@
body {
direction: rtl;
}
-#logo img {
+.layout-columns .column {
float: right;
}
+#sidebar-left, #sidebar-right {
+ margin-right: 0;
+ margin-left: -18em;
+}
+#sidebar-left {
+ right: -18em;
+}
+.logo {
+ float: right;
+}
+.search-box {
+ float: left; /* LTR */
+}
#menu {
padding: 0.5em 0.5em 0 0.5em;
text-align: left;
@@ -15,6 +28,7 @@
#subnavlist {
padding: 0.5em 0 0.4em 1.2em;
}
+
ul.links li {
border-right: 1px solid #9cf;
border-left: none;
Index: themes/bluemarine/bluemarine.info
===================================================================
RCS file: /cvs/drupal/drupal/themes/bluemarine/bluemarine.info,v
retrieving revision 1.5
diff -u -r1.5 bluemarine.info
--- themes/bluemarine/bluemarine.info 18 Feb 2008 19:19:48 -0000 1.5
+++ themes/bluemarine/bluemarine.info 6 May 2008 22:53:51 -0000
@@ -1,6 +1,6 @@
; $Id: bluemarine.info,v 1.5 2008/02/18 19:19:48 dries Exp $
name = Bluemarine
-description = Table-based multi-column theme with a marine and ash color scheme.
+description = Tableless theme with a marine and ash color scheme.
version = VERSION
core = 7.x
engine = phptemplate
|