? 846542-8.drupal.bartik-fluid-width.patch
? 846542.patch
? theme-settings.php
Index: themes/bartik/bartik.info
===================================================================
RCS file: /cvs/drupal/drupal/themes/bartik/bartik.info,v
retrieving revision 1.2
diff -u -p -r1.2 bartik.info
--- themes/bartik/bartik.info	11 Jul 2010 22:06:40 -0000	1.2
+++ themes/bartik/bartik.info	13 Jul 2010 09:59:11 -0000
@@ -36,4 +36,5 @@ regions[footer_fourthcolumn] = Footer fo
 regions[footer] = Footer
 
 settings[shortcut_module_link] = 0
+settings[bartik_width] = fixed
 
Index: themes/bartik/template.php
===================================================================
RCS file: /cvs/drupal/drupal/themes/bartik/template.php,v
retrieving revision 1.2
diff -u -p -r1.2 template.php
--- themes/bartik/template.php	11 Jul 2010 22:06:40 -0000	1.2
+++ themes/bartik/template.php	13 Jul 2010 09:59:11 -0000
@@ -22,6 +22,11 @@ function bartik_preprocess_html(&$variab
     $variables['classes_array'][] = 'footer-columns';
   }
 
+  // Toggle fixed or fluid width.
+  if (theme_get_setting('bartik_width') == 'fluid') {
+    $variables['classes_array'][] = 'fluid-width';
+  }
+
   // Add conditional stylesheets for IE
   drupal_add_css(path_to_theme() . '/css/ie.css', array('weight' => CSS_THEME, 'browsers' => array('IE' => 'lte IE 7', '!IE' => FALSE), 'preprocess' => FALSE));
   drupal_add_css(path_to_theme() . '/css/ie6.css', array('weight' => CSS_THEME, 'browsers' => array('IE' => 'IE 6', '!IE' => FALSE), 'preprocess' => FALSE));
Index: themes/bartik/theme-settings.php
===================================================================
RCS file: themes/bartik/theme-settings.php
diff -N themes/bartik/theme-settings.php
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ themes/bartik/theme-settings.php	13 Jul 2010 09:59:11 -0000
@@ -0,0 +1,24 @@
+<?php
+
+/**
+ * Implements hook_form_system_theme_settings_alter().
+ *
+ * @param $form
+ *   The form.
+ * @param $form_state
+ *   The form state.
+ */
+function bartik_form_system_theme_settings_alter(&$form, $form_state) {
+  $form['bartik_width'] = array(
+    '#type' => 'radios',
+    '#title' => t('Content width'),
+    '#options' => array(
+      'fluid' => t('Fluid width'),
+      'fixed' => t('Fixed width'),
+    ),
+    '#default_value' => theme_get_setting('bartik_width'),
+    '#description' => t('Specify whether the content will wrap to a fixed width or will fluidly expand to the width of the browser window.'),
+    // Place this above the color scheme options.
+    '#weight' => -2,
+  );
+}
Index: themes/bartik/css/layout.css
===================================================================
RCS file: /cvs/drupal/drupal/themes/bartik/css/layout.css,v
retrieving revision 1.1
diff -u -p -r1.1 layout.css
--- themes/bartik/css/layout.css	6 Jul 2010 05:25:51 -0000	1.1
+++ themes/bartik/css/layout.css	13 Jul 2010 09:59:11 -0000
@@ -1,7 +1,18 @@
 /* $Id: layout.css,v 1.1 2010/07/06 05:25:51 webchick Exp $ */
 
 /* ---------- Basic Layout Styles ----------- */
-
+/* Unset container width when we are using the "fluid width" option. */
+body.fluid-width #header div.section,
+body.fluid-width #navigation div.section,
+body.fluid-width #featured div.section,
+body.fluid-width #messages,
+body.fluid-width #main,
+body.fluid-width #triptych,
+body.fluid-width #footer-columns,
+body.fluid-width #footer {
+  width: auto;
+  max-width: 1270px;
+}
 #header div.section,
 #navigation div.section,
 #featured div.section,
@@ -28,10 +39,20 @@
   position: relative;
 }
 .one-sidebar #content {
-  width: 720px;
+  float: left;
+  width: 100%;
+  margin-left: -260px;
+}
+.one-sidebar #content .section {
+  margin-left: 260px;
+}
+.two-sidebars #content .section {
+  margin: 0 260px;
 }
 .two-sidebars #content {
-  width: 480px;
+  float: left;
+  width: 100%;
+  margin: 0 -260px;
 }
 .no-sidebars #content {
   width: 960px;
@@ -39,6 +60,7 @@
 }
 .sidebar {
   width: 240px;
+  z-index: 2;
 }
 #main-wrapper {
   min-height: 500px;