Index: modules/system/page.tpl.php
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/page.tpl.php,v
retrieving revision 1.16
diff -u -p -r1.16 page.tpl.php
--- modules/system/page.tpl.php 18 Feb 2009 14:28:23 -0000 1.16
+++ modules/system/page.tpl.php 24 Feb 2009 06:20:41 -0000
@@ -11,8 +11,8 @@
* - $base_path: The base URL path of the Drupal installation. At the very
* least, this will always default to /.
* - $css: An array of CSS files for the current page.
- * - $directory: The directory the theme is located in, e.g. themes/garland or
- * themes/garland/minelli.
+ * - $directory: The directory the template is located in, e.g. modules/system
+ * or themes/garland.
* - $is_front: TRUE if the current page is the front page. Used to toggle the mission statement.
* - $logged_in: TRUE if the user is registered and signed in.
* - $is_admin: TRUE if the user has permission to access administration pages.
@@ -48,23 +48,20 @@
* site, if they have been configured.
* - $secondary_menu (array): An array containing the Secondary menu links for
* the site, if they have been configured.
+ * - $breadcrumb: The breadcrumb trail for the current page.
*
* Page content (in order of occurrence in the default page.tpl.php):
- * - $left: The HTML for the left sidebar.
- *
- * - $breadcrumb: The breadcrumb trail for the current page.
* - $title: The page title, for use in the actual HTML content.
- * - $help: Dynamic help text, mostly for admin pages.
* - $messages: HTML for status and error messages. Should be displayed prominently.
* - $tabs: Tabs linking to any sub-pages beneath the current page (e.g., the view
* and edit tabs when displaying a node).
- *
+ * - $help: Dynamic help text, mostly for admin pages.
* - $content: The main content of the current Drupal page.
- *
+ * - $feed_icons: A string of all feed icons for the current page.
+ * - $left: The HTML for the left sidebar.
* - $right: The HTML for the right sidebar.
*
* Footer/closing data:
- * - $feed_icons: A string of all feed icons for the current page.
* - $footer_message: The footer message as defined in the admin settings.
* - $footer : The footer region.
* - $closure: Final closing markup from any modules that have altered the page.
@@ -76,7 +73,7 @@
?>
-
+
<?php print $head_title; ?>
@@ -85,98 +82,93 @@
-
-
-
+
Index: themes/stark/layout.css
===================================================================
RCS file: /cvs/drupal/drupal/themes/stark/layout.css,v
retrieving revision 1.1
diff -u -p -r1.1 layout.css
--- themes/stark/layout.css 30 Jan 2009 23:06:23 -0000 1.1
+++ themes/stark/layout.css 24 Feb 2009 06:20:41 -0000
@@ -10,39 +10,47 @@
*
* This layout method works reasonably well, but shouldn't be used on a
* production site because it can break. For example, if an over-large image
- * (one that is wider than 20% of the viewport) is in a sidebar, the entire
- * #main content can shift completely below the sidebar.
+ * (one that is wider than 20% of the viewport) is in the right sidebar, the
+ * sidebar will overlap with the #content to the left.
*/
+#content,
#sidebar-left,
-#main,
#sidebar-right {
- float: left;
display: inline;
position: relative;
+ float:left;
}
-#sidebar-left,
-#sidebar-right {
- width: 20%;
+#content {
+ width: 100%;
}
-
-body.one-sidebar #main {
+body.sidebar-left #content {
width: 80%;
+ left: 20%;
}
-
-body.two-sidebars #main {
+body.sidebar-right #content {
+ width: 80%;
+}
+body.two-sidebars #content {
width: 60%;
+ left: 20%;
+}
+
+#sidebar-left {
+ width: 20%;
+ left: -80%;
}
-body.sidebar-left #main-squeeze {
- margin-left: 20px;
+body.two-sidebars #sidebar-left {
+ left: -60%;
}
-body.sidebar-right #main-squeeze {
- margin-right: 20px;
+#sidebar-right {
+ float: right;
+ width: 20%;
}
-body.two-sidebars #main-squeeze {
- margin: 0 20px;
+.section {
+ margin: 10px;
}