diff options
author | Angie Byron <webchick@24967.no-reply.drupal.org> | 2009-12-01 15:57:40 +0000 |
---|---|---|
committer | Angie Byron <webchick@24967.no-reply.drupal.org> | 2009-12-01 15:57:40 +0000 |
commit | f79924352fc9b1caa5e734e62f0dfa66844f31fb (patch) | |
tree | ead1f96e364bfa00aa4aedc2f21fa3f42e024956 /themes/garland | |
parent | 7de42b4263e255e0fa217fb4729e9c0d32f91de8 (diff) | |
download | brdo-f79924352fc9b1caa5e734e62f0dfa66844f31fb.tar.gz brdo-f79924352fc9b1caa5e734e62f0dfa66844f31fb.tar.bz2 |
#632030 by JohnAlbin: Merge Garland and Minnelli into one theme.
Diffstat (limited to 'themes/garland')
-rw-r--r-- | themes/garland/color/base.png | bin | 29774 -> 23869 bytes | |||
-rw-r--r-- | themes/garland/color/preview.png | bin | 22111 -> 16841 bytes | |||
-rw-r--r-- | themes/garland/garland.info | 3 | ||||
-rw-r--r-- | themes/garland/minnelli/color/base.png | bin | 30077 -> 0 bytes | |||
-rw-r--r-- | themes/garland/minnelli/color/color.inc | 75 | ||||
-rw-r--r-- | themes/garland/minnelli/color/preview.png | bin | 23895 -> 0 bytes | |||
-rw-r--r-- | themes/garland/minnelli/logo.png | bin | 5399 -> 0 bytes | |||
-rw-r--r-- | themes/garland/minnelli/minnelli.css | 14 | ||||
-rw-r--r-- | themes/garland/minnelli/minnelli.info | 8 | ||||
-rw-r--r-- | themes/garland/minnelli/screenshot.png | bin | 11612 -> 0 bytes | |||
-rw-r--r-- | themes/garland/style.css | 15 | ||||
-rw-r--r-- | themes/garland/template.php | 20 | ||||
-rw-r--r-- | themes/garland/theme-settings.php | 25 |
13 files changed, 62 insertions, 98 deletions
diff --git a/themes/garland/color/base.png b/themes/garland/color/base.png Binary files differindex 4a31efed0..428c21221 100644 --- a/themes/garland/color/base.png +++ b/themes/garland/color/base.png diff --git a/themes/garland/color/preview.png b/themes/garland/color/preview.png Binary files differindex 3403ee8dd..d80ad30f8 100644 --- a/themes/garland/color/preview.png +++ b/themes/garland/color/preview.png diff --git a/themes/garland/garland.info b/themes/garland/garland.info index 4c9597771..13576cd1e 100644 --- a/themes/garland/garland.info +++ b/themes/garland/garland.info @@ -1,9 +1,10 @@ ; $Id$ name = Garland -description = Tableless, recolorable, multi-column, fluid width theme. +description = A multi-column theme which can be configured to modify colors and switch between fixed and fluid width layouts. package = Core version = VERSION core = 7.x engine = phptemplate stylesheets[all][] = style.css stylesheets[print][] = print.css +settings[garland_width] = fluid diff --git a/themes/garland/minnelli/color/base.png b/themes/garland/minnelli/color/base.png Binary files differdeleted file mode 100644 index ef1df365e..000000000 --- a/themes/garland/minnelli/color/base.png +++ /dev/null diff --git a/themes/garland/minnelli/color/color.inc b/themes/garland/minnelli/color/color.inc deleted file mode 100644 index eab1235be..000000000 --- a/themes/garland/minnelli/color/color.inc +++ /dev/null @@ -1,75 +0,0 @@ -<?php -// $Id$ - -$info = array( - - // Pre-defined color schemes. - 'schemes' => array( - '#0072b9,#027ac6,#2385c2,#5ab5ee,#494949' => t('Blue Lagoon (Default)'), - '#464849,#2f416f,#2a2b2d,#5d6779,#494949' => t('Ash'), - '#55c0e2,#000000,#085360,#007e94,#696969' => t('Aquamarine'), - '#d5b048,#6c420e,#331900,#971702,#494949' => t('Belgian Chocolate'), - '#3f3f3f,#336699,#6598cb,#6598cb,#000000' => t('Bluemarine'), - '#d0cb9a,#917803,#efde01,#e6fb2d,#494949' => t('Citrus Blast'), - '#0f005c,#434f8c,#4d91ff,#1a1575,#000000' => t('Cold Day'), - '#c9c497,#0c7a00,#03961e,#7be000,#494949' => t('Greenbeam'), - '#ffe23d,#a9290a,#fc6d1d,#a30f42,#494949' => t('Mediterrano'), - '#788597,#3f728d,#a9adbc,#d4d4d4,#707070' => t('Mercury'), - '#5b5fa9,#5b5faa,#0a2352,#9fa8d5,#494949' => t('Nocturnal'), - '#7db323,#6a9915,#b5d52a,#7db323,#191a19' => t('Olivia'), - '#12020b,#1b1a13,#f391c6,#f41063,#898080' => t('Pink Plastic'), - '#b7a0ba,#c70000,#a1443a,#f21107,#515d52' => t('Shiny Tomato'), - '#18583d,#1b5f42,#34775a,#52bf90,#2d2d2d' => t('Teal Top'), - ), - - // Images to copy over. - 'copy' => array( - '../images/menu-collapsed.gif', - '../images/menu-collapsed-rtl.gif', - '../images/menu-expanded.gif', - '../images/menu-leaf.gif', - ), - - // CSS files (excluding @import) to rewrite with new color scheme. - 'css' => array( - '../style.css', - ), - - // Coordinates of gradient (x, y, width, height). - 'gradient' => array(0, 37, 760, 121), - - // Color areas to fill (x, y, width, height). - 'fill' => array( - 'base' => array(0, 0, 760, 568), - 'link' => array(107, 533, 41, 23), - ), - - // Coordinates of all the theme slices (x, y, width, height) - // with their filename as used in the stylesheet. - 'slices' => array( - '../images/body.png' => array(0, 37, 1, 280), - '../images/bg-bar.png' => array(202, 530, 76, 14), - '../images/bg-bar-white.png' => array(202, 506, 76, 14), - '../images/bg-tab.png' => array(107, 533, 41, 23), - '../images/bg-navigation.png' => array(0, 0, 7, 37), - '../images/bg-content-left.png' => array(40, 117, 50, 352), - '../images/bg-content-right.png' => array(510, 117, 50, 352), - '../images/bg-content.png' => array(299, 117, 7, 200), - '../images/bg-navigation-item.png' => array(32, 37, 17, 12), - '../images/bg-navigation-item-hover.png' => array(54, 37, 17, 12), - '../images/gradient-inner.png' => array(646, 307, 112, 42), - - 'logo.png' => array(622, 51, 64, 73), - 'screenshot.png' => array(0, 37, 400, 240), - ), - - // Reference color used for blending. Matches the base.png's colors. - 'blend_target' => '#ffffff', - - // Preview files. - 'preview_image' => 'color/preview.png', - 'preview_css' => '../color/preview.css', - - // Base file for image generation. - 'base_image' => 'color/base.png', -); diff --git a/themes/garland/minnelli/color/preview.png b/themes/garland/minnelli/color/preview.png Binary files differdeleted file mode 100644 index b7e9a1ac5..000000000 --- a/themes/garland/minnelli/color/preview.png +++ /dev/null diff --git a/themes/garland/minnelli/logo.png b/themes/garland/minnelli/logo.png Binary files differdeleted file mode 100644 index 3529fef31..000000000 --- a/themes/garland/minnelli/logo.png +++ /dev/null diff --git a/themes/garland/minnelli/minnelli.css b/themes/garland/minnelli/minnelli.css deleted file mode 100644 index 017801d9b..000000000 --- a/themes/garland/minnelli/minnelli.css +++ /dev/null @@ -1,14 +0,0 @@ -/* $Id$ */ - -body #wrapper #container { - width: 560px; -} - -body.two-sidebars #wrapper #container { - width: 980px; -} - -body.sidebar-first #wrapper #container, -body.sidebar-second #wrapper #container { - width: 770px; -} diff --git a/themes/garland/minnelli/minnelli.info b/themes/garland/minnelli/minnelli.info deleted file mode 100644 index e5c88fe72..000000000 --- a/themes/garland/minnelli/minnelli.info +++ /dev/null @@ -1,8 +0,0 @@ -; $Id$ -name = Minnelli -description = Tableless, recolorable, multi-column, fixed width theme. -package = Core -version = VERSION -core = 7.x -base theme = garland -stylesheets[all][] = minnelli.css diff --git a/themes/garland/minnelli/screenshot.png b/themes/garland/minnelli/screenshot.png Binary files differdeleted file mode 100644 index 518871b2f..000000000 --- a/themes/garland/minnelli/screenshot.png +++ /dev/null diff --git a/themes/garland/style.css b/themes/garland/style.css index f865cee3e..0f92c757f 100644 --- a/themes/garland/style.css +++ b/themes/garland/style.css @@ -366,9 +366,24 @@ table .form-button, table .form-submit { background: #edf5fa url(images/body.png) repeat-x 50% 0; } +/* Set container widths when we are using the "fixed width" option. */ #wrapper #container { + width: 560px; margin: 0 auto; padding: 0 20px; +} + +body.one-sidebar #wrapper #container { + width: 770px; +} + +body.two-sidebars #wrapper #container { + width: 980px; +} + +/* Unset container width when we are using the "fluid width" option. */ +body.fluid-width #wrapper #container { + width: auto; max-width: 1270px; } diff --git a/themes/garland/template.php b/themes/garland/template.php index 66f3f3957..677d13831 100644 --- a/themes/garland/template.php +++ b/themes/garland/template.php @@ -22,6 +22,26 @@ function garland_breadcrumb($variables) { } /** + * Override or insert variables into the maintenance page template. + */ +function garland_preprocess_maintenance_page(&$vars) { + // Toggle fixed or fluid width. + if (theme_get_setting('garland_width') == 'fluid') { + $vars['classes_array'][] = 'fluid-width'; + } +} + +/** + * Override or insert variables into the html template. + */ +function garland_preprocess_html(&$vars) { + // Toggle fixed or fluid width. + if (theme_get_setting('garland_width') == 'fluid') { + $vars['classes_array'][] = 'fluid-width'; + } +} + +/** * Override or insert variables into the html template. */ function garland_process_html(&$vars) { diff --git a/themes/garland/theme-settings.php b/themes/garland/theme-settings.php new file mode 100644 index 000000000..9f79b150e --- /dev/null +++ b/themes/garland/theme-settings.php @@ -0,0 +1,25 @@ +<?php +// $Id$ + +/** + * Implement hook_form_system_theme_settings_alter(). + * + * @param $form + * The form. + * @param $form_state + * The form state. + */ +function garland_form_system_theme_settings_alter(&$form, $form_state) { + $form['garland_width'] = array( + '#type' => 'radios', + '#title' => t('Content width'), + '#options' => array( + 'fluid' => t('Fluid width'), + 'fixed' => t('Fixed width'), + ), + '#default_value' => theme_get_setting('garland_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, + ); +} |