summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDries Buytaert2011-10-01 20:37:41 (GMT)
committerDries Buytaert2011-10-01 20:37:41 (GMT)
commit23c5741b6123060d10d0177956e90d4d37cd5218 (patch)
treecee5b7970bc1ade0c3e8902712a91d8fd15310d1
parent4b522e22ad390402e93af9940fa7e74d05465af2 (diff)
- Patch #911054 by Rob Loach, cosmicdreams, aspilicious, Jacine: remove Garland from core.
-rw-r--r--CHANGELOG.txt1
-rw-r--r--MAINTAINERS.txt3
-rw-r--r--modules/color/color.test9
-rw-r--r--modules/comment/comment.test4
-rw-r--r--modules/system/system.install12
-rw-r--r--sites/default/default.settings.php2
-rw-r--r--themes/garland/color/base.pngbin20894 -> 0 bytes
-rw-r--r--themes/garland/color/color.inc220
-rw-r--r--themes/garland/color/preview.css60
-rw-r--r--themes/garland/color/preview.pngbin9965 -> 0 bytes
-rw-r--r--themes/garland/comment.tpl.php31
-rw-r--r--themes/garland/garland.info8
-rw-r--r--themes/garland/images/bg-bar-white.pngbin103 -> 0 bytes
-rw-r--r--themes/garland/images/bg-bar.pngbin125 -> 0 bytes
-rw-r--r--themes/garland/images/bg-content-left.pngbin2889 -> 0 bytes
-rw-r--r--themes/garland/images/bg-content-right.pngbin2819 -> 0 bytes
-rw-r--r--themes/garland/images/bg-content.pngbin485 -> 0 bytes
-rw-r--r--themes/garland/images/bg-navigation-item-hover.pngbin441 -> 0 bytes
-rw-r--r--themes/garland/images/bg-navigation-item.pngbin499 -> 0 bytes
-rw-r--r--themes/garland/images/bg-navigation.pngbin104 -> 0 bytes
-rw-r--r--themes/garland/images/bg-tab.pngbin115 -> 0 bytes
-rw-r--r--themes/garland/images/body.pngbin680 -> 0 bytes
-rw-r--r--themes/garland/images/gradient-inner.pngbin188 -> 0 bytes
-rw-r--r--themes/garland/images/menu-collapsed-rtl.gifbin176 -> 0 bytes
-rw-r--r--themes/garland/images/menu-collapsed.gifbin176 -> 0 bytes
-rw-r--r--themes/garland/images/menu-expanded.gifbin183 -> 0 bytes
-rw-r--r--themes/garland/images/menu-leaf.gifbin174 -> 0 bytes
-rw-r--r--themes/garland/images/task-list.pngbin128 -> 0 bytes
-rw-r--r--themes/garland/logo.pngbin5116 -> 0 bytes
-rw-r--r--themes/garland/maintenance-page.tpl.php87
-rw-r--r--themes/garland/node.tpl.php34
-rw-r--r--themes/garland/page.tpl.php68
-rw-r--r--themes/garland/print.css61
-rw-r--r--themes/garland/screenshot.pngbin10950 -> 0 bytes
-rw-r--r--themes/garland/style-rtl.css344
-rw-r--r--themes/garland/style.css1255
-rw-r--r--themes/garland/template.php158
-rw-r--r--themes/garland/theme-settings.php30
38 files changed, 18 insertions, 2369 deletions
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 84b2f9a..a048654 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -6,6 +6,7 @@ Drupal 8.0, xxxx-xx-xx (development version)
modules with similar functionality are available:
* Blog
* Profile
+- Removed the Garland theme from core.
- Universally Unique IDentifier (UUID):
* Support for generating and validating UUIDs.
diff --git a/MAINTAINERS.txt b/MAINTAINERS.txt
index fb4a28c..3c8c8af 100644
--- a/MAINTAINERS.txt
+++ b/MAINTAINERS.txt
@@ -280,9 +280,6 @@ Bartik theme
- Jen Simmons 'jensimmons' <http://drupal.org/user/140882>
- Jeff Burns 'Jeff Burnz' <http://drupal.org/user/61393>
-Garland theme
-- John Albin Wilkins 'JohnAlbin' <http://drupal.org/user/32095>
-
Seven theme
- Jeff Burns 'Jeff Burnz' <http://drupal.org/user/61393>
diff --git a/modules/color/color.test b/modules/color/color.test
index 897bd6c..36f31ba 100644
--- a/modules/color/color.test
+++ b/modules/color/color.test
@@ -16,7 +16,7 @@ class ColorTestCase extends DrupalWebTestCase {
public static function getInfo() {
return array(
'name' => 'Color functionality',
- 'description' => 'Modify the Bartik and Garland theme colors and make sure the changes are reflected on the frontend',
+ 'description' => 'Modify the Bartik theme colors and make sure the changes are reflected on the frontend.',
'group' => 'Color',
);
}
@@ -27,18 +27,13 @@ class ColorTestCase extends DrupalWebTestCase {
// Create users.
$this->big_user = $this->drupalCreateUser(array('administer themes'));
- // This tests the color module in both Bartik and Garland.
+ // This tests the color module in Bartik.
$this->themes = array(
'bartik' => array(
'palette_input' => 'palette[bg]',
'scheme' => 'slate',
'scheme_color' => '#3b3b3b',
),
- 'garland' => array(
- 'palette_input' => 'palette[link]',
- 'scheme' => 'greenbeam',
- 'scheme_color' => '#0c7a00',
- ),
);
theme_enable(array_keys($this->themes));
diff --git a/modules/comment/comment.test b/modules/comment/comment.test
index a825eb5..2e96ba3 100644
--- a/modules/comment/comment.test
+++ b/modules/comment/comment.test
@@ -569,8 +569,8 @@ class CommentInterfaceTest extends CommentHelperCase {
*/
function testCommentLinks() {
// Bartik theme alters comment links, so use a different theme.
- theme_enable(array('garland'));
- variable_set('theme_default', 'garland');
+ theme_enable(array('stark'));
+ variable_set('theme_default', 'stark');
// Remove additional user permissions from $this->web_user added by setUp(),
// since this test is limited to anonymous and authenticated roles only.
diff --git a/modules/system/system.install b/modules/system/system.install
index 4ffd5f4..24933e2 100644
--- a/modules/system/system.install
+++ b/modules/system/system.install
@@ -1630,6 +1630,18 @@ function system_update_8000() {
}
/**
+ * Move from the Garland theme.
+ */
+function system_update_8001() {
+ $themes = array('theme_default', 'maintenance_theme', 'admin_theme');
+ foreach ($themes as $theme) {
+ if (variable_get($theme) == 'garland') {
+ variable_set($theme, 'bartik');
+ }
+ }
+}
+
+/**
* @} End of "defgroup updates-7.x-to-8.x"
* The next series of updates should start at 9000.
*/
diff --git a/sites/default/default.settings.php b/sites/default/default.settings.php
index 8479cf5..a8fe52b 100644
--- a/sites/default/default.settings.php
+++ b/sites/default/default.settings.php
@@ -308,7 +308,7 @@ ini_set('session.cookie_lifetime', 2000000);
* Remove the leading hash signs to enable.
*/
# $conf['site_name'] = 'My Drupal site';
-# $conf['theme_default'] = 'garland';
+# $conf['theme_default'] = 'stark';
# $conf['anonymous'] = 'Visitor';
/**
diff --git a/themes/garland/color/base.png b/themes/garland/color/base.png
deleted file mode 100644
index 983e0fe..0000000
--- a/themes/garland/color/base.png
+++ /dev/null
Binary files differ
diff --git a/themes/garland/color/color.inc b/themes/garland/color/color.inc
deleted file mode 100644
index 1633692..0000000
--- a/themes/garland/color/color.inc
+++ /dev/null
@@ -1,220 +0,0 @@
-<?php
-
-$info = array(
-
- // Available colors and color labels used in theme.
- 'fields' => array(
- 'base' => t('Base color'),
- 'link' => t('Link color'),
- 'top' => t('Header top'),
- 'bottom' => t('Header bottom'),
- 'text' => t('Text color'),
- ),
- // Pre-defined color schemes.
- 'schemes' => array(
- 'default' => array(
- 'title' => t('Blue Lagoon (Default)'),
- 'colors' => array(
- 'base' => '#0072b9',
- 'link' => '#027ac6',
- 'top' => '#2385c2',
- 'bottom' => '#5ab5ee',
- 'text' => '#494949',
- ),
- ),
- 'ash' => array(
- 'title' => t('Ash'),
- 'colors' => array(
- 'base' => '#464849',
- 'link' => '#2f416f',
- 'top' => '#2a2b2d',
- 'bottom' => '#5d6779',
- ),
- ),
- 'aquamarine' => array(
- 'title' => t('Aquamarine'),
- 'colors' => array(
- 'base' => '#55c0e2',
- 'link' => '#000000',
- 'text' => '#696969',
- 'top' => '#085360',
- 'bottom' => '#007e94',
- ),
- ),
- 'chocolate' => array(
- 'title' => t('Belgian Chocolate'),
- 'colors' => array(
- 'base' => '#d5b048',
- 'link' => '#6c420e',
- 'top' => '#331900',
- 'bottom' => '#971702',
- ),
- ),
- 'bluemarine' => array(
- 'title' => t('Bluemarine'),
- 'colors' => array(
- 'base' => '#3f3f3f',
- 'link' => '#336699',
- 'text' => '#000000',
- 'top' => '#6598cb',
- 'bottom' => '#6598cb',
- ),
- ),
- 'citrus' => array(
- 'title' => t('Citrus Blast'),
- 'colors' => array(
- 'base' => '#d0cb9a',
- 'link' => '#917803',
- 'top' => '#efde01',
- 'bottom' => '#e6fb2d',
- ),
- ),
- 'cold' => array(
- 'title' => t('Cold Day'),
- 'colors' => array(
- 'base' => '#0f005c',
- 'link' => '#434f8c',
- 'text' => '#000000',
- 'top' => '#4d91ff',
- 'bottom' => '#1a1575',
- ),
- ),
- 'greenbeam' => array(
- 'title' => t('Greenbeam'),
- 'colors' => array(
- 'base' => '#c9c497',
- 'link' => '#0c7a00',
- 'top' => '#03961e',
- 'bottom' => '#7be000',
- ),
- ),
- 'mediterrano' => array(
- 'title' => t('Mediterrano'),
- 'colors' => array(
- 'base' => '#ffe23d',
- 'link' => '#a9290a',
- 'top' => '#fc6d1d',
- 'bottom' => '#a30f42',
- ),
- ),
- 'mercury' => array(
- 'title' => t('Mercury'),
- 'colors' => array(
- 'base' => '#788597',
- 'link' => '#3f728d',
- 'top' => '#a9adbc',
- 'bottom' => '#d4d4d4',
- 'text' => '#707070',
- ),
- ),
- 'nocturnal' => array(
- 'title' => t('Nocturnal'),
- 'colors' => array(
- 'base' => '#5b5fa9',
- 'link' => '#5b5faa',
- 'top' => '#0a2352',
- 'bottom' => '#9fa8d5',
- ),
- ),
- 'olivia' => array(
- 'title' => t('Olivia'),
- 'colors' => array(
- 'base' => '#7db323',
- 'link' => '#6a9915',
- 'top' => '#b5d52a',
- 'bottom' => '#7db323',
- 'text' => '#191a19',
- ),
- ),
- 'pink_plastic' => array(
- 'title' => t('Pink Plastic'),
- 'colors' => array(
- 'base' => '#12020b',
- 'link' => '#1b1a13',
- 'top' => '#f391c6',
- 'bottom' => '#f41063',
- 'text' => '#898080',
- ),
- ),
- 'shiny_tomato' => array(
- 'title' => t('Shiny Tomato'),
- 'colors' => array(
- 'base' => '#b7a0ba',
- 'link' => '#c70000',
- 'top' => '#a1443a',
- 'bottom' => '#f21107',
- 'text' => '#515d52',
- ),
- ),
- 'teal_top' => array(
- 'title' => t('Teal Top'),
- 'colors' => array(
- 'base' => '#18583d',
- 'link' => '#1b5f42',
- 'top' => '#34775a',
- 'bottom' => '#52bf90',
- 'text' => '#2d2d2d',
- ),
- ),
- ),
-
- // 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',
- ),
-
- // Gradient definitions.
- 'gradients' => array(
- array(
- // (x, y, width, height).
- 'dimension' => array(0, 38, 760, 121),
- // Direction of gradient ('vertical' or 'horizontal').
- 'direction' => 'vertical',
- // Keys of colors to use for the gradient.
- 'colors' => array('top', 'bottom'),
- ),
- ),
-
- // 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/color/preview.css b/themes/garland/color/preview.css
deleted file mode 100644
index cf32438..0000000
--- a/themes/garland/color/preview.css
+++ /dev/null
@@ -1,60 +0,0 @@
-
-/* Positioning */
-#preview {
- overflow: hidden;
- max-width: 100%;
-}
-#preview,
-#preview #img {
- width: 600px;
- height: 371px;
-}
-#preview #gradient-0 {
- position: absolute;
- left: 0;
- right: 0;
- top: 19px;
- height: 120px;
- z-index: 2;
-}
-#preview #text {
- position: absolute;
- left: 80px;
- width: 436px;
- top: 160px;
- height: 120px;
- z-index: 4;
-}
-#preview #img {
- position: relative;
- z-index: 3;
- background-image: url(preview.png);
-}
-#preview #gradient-0 .gradient-line {
- height: 10px;
- overflow: hidden;
-}
-
-/* Basic styles to match */
-#preview {
- font: 12px/170% Verdana;
-}
-#preview h2 {
- margin: 0;
- padding: 0;
- font-weight: normal;
- font-family: Helvetica, Arial, sans-serif;
- font-size: 160%;
- line-height: 130%;
-}
-#preview p {
- margin: .5em 0;
-}
-#preview a:link,
-#preview a:visited {
- text-decoration: none;
- font-weight: normal;
-}
-#preview a:hover {
- text-decoration: underline;
-}
diff --git a/themes/garland/color/preview.png b/themes/garland/color/preview.png
deleted file mode 100644
index 0dc5bf9..0000000
--- a/themes/garland/color/preview.png
+++ /dev/null
Binary files differ
diff --git a/themes/garland/comment.tpl.php b/themes/garland/comment.tpl.php
deleted file mode 100644
index 952cc01..0000000
--- a/themes/garland/comment.tpl.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-?>
-<div class="<?php print $classes . ' ' . $zebra; ?>"<?php print $attributes; ?>>
-
- <div class="clearfix">
-
- <span class="submitted"><?php print $submitted ?></span>
-
- <?php if ($new): ?>
- <span class="new"><?php print drupal_ucfirst($new) ?></span>
- <?php endif; ?>
-
- <?php print $picture ?>
-
- <?php print render($title_prefix); ?>
- <h3<?php print $title_attributes; ?>><?php print $title ?></h3>
- <?php print render($title_suffix); ?>
-
- <div class="content"<?php print $content_attributes; ?>>
- <?php hide($content['links']); print render($content); ?>
- <?php if ($signature): ?>
- <div class="clearfix">
- <div>—</div>
- <?php print $signature ?>
- </div>
- <?php endif; ?>
- </div>
- </div>
-
- <?php print render($content['links']) ?>
-</div>
diff --git a/themes/garland/garland.info b/themes/garland/garland.info
deleted file mode 100644
index add4149..0000000
--- a/themes/garland/garland.info
+++ /dev/null
@@ -1,8 +0,0 @@
-name = Garland
-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 = 8.x
-stylesheets[all][] = style.css
-stylesheets[print][] = print.css
-settings[garland_width] = fluid
diff --git a/themes/garland/images/bg-bar-white.png b/themes/garland/images/bg-bar-white.png
deleted file mode 100644
index 4549a5f..0000000
--- a/themes/garland/images/bg-bar-white.png
+++ /dev/null
Binary files differ
diff --git a/themes/garland/images/bg-bar.png b/themes/garland/images/bg-bar.png
deleted file mode 100644
index 1fbcae0..0000000
--- a/themes/garland/images/bg-bar.png
+++ /dev/null
Binary files differ
diff --git a/themes/garland/images/bg-content-left.png b/themes/garland/images/bg-content-left.png
deleted file mode 100644
index 8297f74..0000000
--- a/themes/garland/images/bg-content-left.png
+++ /dev/null
Binary files differ
diff --git a/themes/garland/images/bg-content-right.png b/themes/garland/images/bg-content-right.png
deleted file mode 100644
index 9fe5343..0000000
--- a/themes/garland/images/bg-content-right.png
+++ /dev/null
Binary files differ
diff --git a/themes/garland/images/bg-content.png b/themes/garland/images/bg-content.png
deleted file mode 100644
index d55828e..0000000
--- a/themes/garland/images/bg-content.png
+++ /dev/null
Binary files differ
diff --git a/themes/garland/images/bg-navigation-item-hover.png b/themes/garland/images/bg-navigation-item-hover.png
deleted file mode 100644
index c783d71..0000000
--- a/themes/garland/images/bg-navigation-item-hover.png
+++ /dev/null
Binary files differ
diff --git a/themes/garland/images/bg-navigation-item.png b/themes/garland/images/bg-navigation-item.png
deleted file mode 100644
index 375d095..0000000
--- a/themes/garland/images/bg-navigation-item.png
+++ /dev/null
Binary files differ
diff --git a/themes/garland/images/bg-navigation.png b/themes/garland/images/bg-navigation.png
deleted file mode 100644
index 18b9559..0000000
--- a/themes/garland/images/bg-navigation.png
+++ /dev/null
Binary files differ
diff --git a/themes/garland/images/bg-tab.png b/themes/garland/images/bg-tab.png
deleted file mode 100644
index 18554b0..0000000
--- a/themes/garland/images/bg-tab.png
+++ /dev/null
Binary files differ
diff --git a/themes/garland/images/body.png b/themes/garland/images/body.png
deleted file mode 100644
index 84bac9f..0000000
--- a/themes/garland/images/body.png
+++ /dev/null
Binary files differ
diff --git a/themes/garland/images/gradient-inner.png b/themes/garland/images/gradient-inner.png
deleted file mode 100644
index ba403b3..0000000
--- a/themes/garland/images/gradient-inner.png
+++ /dev/null
Binary files differ
diff --git a/themes/garland/images/menu-collapsed-rtl.gif b/themes/garland/images/menu-collapsed-rtl.gif
deleted file mode 100644
index fb0beb6..0000000
--- a/themes/garland/images/menu-collapsed-rtl.gif
+++ /dev/null
Binary files differ
diff --git a/themes/garland/images/menu-collapsed.gif b/themes/garland/images/menu-collapsed.gif
deleted file mode 100644
index 3dc9ca7..0000000
--- a/themes/garland/images/menu-collapsed.gif
+++ /dev/null
Binary files differ
diff --git a/themes/garland/images/menu-expanded.gif b/themes/garland/images/menu-expanded.gif
deleted file mode 100644
index 126ccc1..0000000
--- a/themes/garland/images/menu-expanded.gif
+++ /dev/null
Binary files differ
diff --git a/themes/garland/images/menu-leaf.gif b/themes/garland/images/menu-leaf.gif
deleted file mode 100644
index a55d802..0000000
--- a/themes/garland/images/menu-leaf.gif
+++ /dev/null
Binary files differ
diff --git a/themes/garland/images/task-list.png b/themes/garland/images/task-list.png
deleted file mode 100644
index 3f9b74f..0000000
--- a/themes/garland/images/task-list.png
+++ /dev/null
Binary files differ
diff --git a/themes/garland/logo.png b/themes/garland/logo.png
deleted file mode 100644
index bef4865..0000000
--- a/themes/garland/logo.png
+++ /dev/null
Binary files differ
diff --git a/themes/garland/maintenance-page.tpl.php b/themes/garland/maintenance-page.tpl.php
deleted file mode 100644
index 75fb147..0000000
--- a/themes/garland/maintenance-page.tpl.php
+++ /dev/null
@@ -1,87 +0,0 @@
-<?php
-
-/**
- * @file
- * Override of the default maintenance page.
- *
- * This is an override of the default maintenance page. Used for Garland and
- * Minnelli, this file should not be moved or modified since the installation
- * and update pages depend on this file.
- *
- * This mirrors closely page.tpl.php for Garland in order to share the same
- * styles.
- */
-?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php print $language->language ?>" lang="<?php print $language->language ?>" dir="<?php print $language->dir ?>">
- <head>
- <title><?php print $head_title ?></title>
- <?php print $head ?>
- <?php print $styles ?>
- <?php print $scripts ?>
- </head>
- <body class="<?php print $classes ?>">
-
-<!-- Layout -->
- <div id="header-region" class="clearfix"><?php print $header; ?></div>
-
- <div id="wrapper">
- <div id="container" class="clearfix">
-
- <div id="header">
- <div id="logo-floater">
- <?php
- // Prepare header
- $site_fields = array();
- if ($site_name) {
- $site_fields[] = $site_name;
- }
- if ($site_slogan) {
- $site_fields[] = $site_slogan;
- }
- $site_title = implode(' ', $site_fields);
- if ($site_fields) {
- $site_fields[0] = '<span>' . $site_fields[0] . '</span>';
- }
- $site_html = implode(' ', $site_fields);
-
- if ($logo || $site_title) {
- print '<h1 id="branding"><a href="' . $base_path . '" title="' . $site_title . '">';
- if ($logo) {
- print '<img src="' . $logo . '" alt="' . $site_title . '" id="logo" />';
- }
- print $site_html . '</a></h1>';
- }
- ?>
- </div>
-
- </div> <!-- /header -->
-
- <?php if ($sidebar_first): ?>
- <div id="sidebar-first" class="sidebar">
- <?php print $sidebar_first ?>
- </div>
- <?php endif; ?>
-
- <div id="center"><div id="squeeze"><div class="right-corner"><div class="left-corner">
- <?php if ($title): ?><h2><?php print $title ?></h2><?php endif; ?>
- <?php print $messages; ?>
- <?php print $help; ?>
- <div class="clearfix">
- <?php print $content ?>
- </div>
- <div id="footer"><?php print $footer ?></div>
- </div></div></div></div> <!-- /.left-corner, /.right-corner, /#squeeze, /#center -->
-
- <?php if ($sidebar_second): ?>
- <div id="sidebar-second" class="sidebar">
- <?php print $sidebar_second ?>
- </div>
- <?php endif; ?>
-
- </div> <!-- /container -->
- </div>
-<!-- /layout -->
-
- </body>
-</html>
diff --git a/themes/garland/node.tpl.php b/themes/garland/node.tpl.php
deleted file mode 100644
index 27808f4..0000000
--- a/themes/garland/node.tpl.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-?>
-<div id="node-<?php print $node->nid; ?>" class="<?php print $classes; ?>"<?php print $attributes; ?>>
-
- <?php print $user_picture; ?>
-
- <?php print render($title_prefix); ?>
- <?php if (!$page): ?>
- <h2<?php print $title_attributes; ?>><a href="<?php print $node_url; ?>"><?php print $title; ?></a></h2>
- <?php endif; ?>
- <?php print render($title_suffix); ?>
-
- <?php if ($display_submitted): ?>
- <span class="submitted"><?php print $submitted ?></span>
- <?php endif; ?>
-
- <div class="content clearfix"<?php print $content_attributes; ?>>
- <?php
- // We hide the comments and links now so that we can render them later.
- hide($content['comments']);
- hide($content['links']);
- print render($content);
- ?>
- </div>
-
- <div class="clearfix">
- <?php if (!empty($content['links'])): ?>
- <div class="links"><?php print render($content['links']); ?></div>
- <?php endif; ?>
-
- <?php print render($content['comments']); ?>
- </div>
-
-</div>
diff --git a/themes/garland/page.tpl.php b/themes/garland/page.tpl.php
deleted file mode 100644
index 326255c..0000000
--- a/themes/garland/page.tpl.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-?>
- <?php print render($page['header']); ?>
-
- <div id="wrapper">
- <div id="container" class="clearfix">
-
- <div id="header">
- <div id="logo-floater">
- <?php if ($logo || $site_title): ?>
- <?php if ($title): ?>
- <div id="branding"><strong><a href="<?php print $front_page ?>">
- <?php if ($logo): ?>
- <img src="<?php print $logo ?>" alt="<?php print $site_name_and_slogan ?>" title="<?php print $site_name_and_slogan ?>" id="logo" />
- <?php endif; ?>
- <?php print $site_html ?>
- </a></strong></div>
- <?php else: /* Use h1 when the content title is empty */ ?>
- <h1 id="branding"><a href="<?php print $front_page ?>">
- <?php if ($logo): ?>
- <img src="<?php print $logo ?>" alt="<?php print $site_name_and_slogan ?>" title="<?php print $site_name_and_slogan ?>" id="logo" />
- <?php endif; ?>
- <?php print $site_html ?>
- </a></h1>
- <?php endif; ?>
- <?php endif; ?>
- </div>
-
- <?php if ($primary_nav): print $primary_nav; endif; ?>
- <?php if ($secondary_nav): print $secondary_nav; endif; ?>
- </div> <!-- /#header -->
-
- <?php if ($page['sidebar_first']): ?>
- <div id="sidebar-first" class="sidebar">
- <?php print render($page['sidebar_first']); ?>
- </div>
- <?php endif; ?>
-
- <div id="center"><div id="squeeze"><div class="right-corner"><div class="left-corner">
- <?php print $breadcrumb; ?>
- <?php if ($page['highlighted']): ?><div id="highlighted"><?php print render($page['highlighted']); ?></div><?php endif; ?>
- <a id="main-content"></a>
- <?php if ($tabs): ?><div id="tabs-wrapper" class="clearfix"><?php endif; ?>
- <?php print render($title_prefix); ?>
- <?php if ($title): ?>
- <h1<?php print $tabs ? ' class="with-tabs"' : '' ?>><?php print $title ?></h1>
- <?php endif; ?>
- <?php print render($title_suffix); ?>
- <?php if ($tabs): ?><?php print render($tabs); ?></div><?php endif; ?>
- <?php print render($tabs2); ?>
- <?php print $messages; ?>
- <?php print render($page['help']); ?>
- <?php if ($action_links): ?><ul class="action-links"><?php print render($action_links); ?></ul><?php endif; ?>
- <div class="clearfix">
- <?php print render($page['content']); ?>
- </div>
- <?php print $feed_icons ?>
- <?php print render($page['footer']); ?>
- </div></div></div></div> <!-- /.left-corner, /.right-corner, /#squeeze, /#center -->
-
- <?php if ($page['sidebar_second']): ?>
- <div id="sidebar-second" class="sidebar">
- <?php print render($page['sidebar_second']); ?>
- </div>
- <?php endif; ?>
-
- </div> <!-- /#container -->
- </div> <!-- /#wrapper -->
diff --git a/themes/garland/print.css b/themes/garland/print.css
deleted file mode 100644
index df4f0ae..0000000
--- a/themes/garland/print.css
+++ /dev/null
@@ -1,61 +0,0 @@
-
-body,
-input,
-textarea,
-select {
- color: #000;
- background: none;
- font-family: Verdana, sans-serif;
- font-size: 11pt;
-}
-
-ul.main-menu,
-ul.secondary-menu,
-#header-region,
-.sidebar {
- display: none;
-}
-
-body.two-sidebars,
-body.sidebar-first,
-body.sidebar-second,
-body {
- width: 640px;
-}
-
-body.sidebar-first #center,
-body.sidebar-second #center,
-body.two-sidebars #center,
-body.sidebar-first #squeeze,
-body.sidebar-second #squeeze,
-body.two-sidebars #squeeze {
- margin: 0;
-}
-
-#wrapper,
-#wrapper #container .breadcrumb,
-#wrapper #container #center,
-#wrapper #container #center .right-corner,
-#wrapper #container #center .right-corner .left-corner,
-#wrapper #container #footer,
-#wrapper #container #center #squeeze {
- position: static;
- left: 0;
- padding: 0;
- margin: 0;
- width: auto;
- float: none;
- clear: both;
- background: none;
-}
-
-#wrapper #container #header {
- height: 130px;
-}
-
-#wrapper #container #header h1,
-#wrapper #container #header h1 a:link,
-#wrapper #container #header h1 a:visited {
- text-shadow: none;
- color: #000;
-}
diff --git a/themes/garland/screenshot.png b/themes/garland/screenshot.png
deleted file mode 100644
index f34590e..0000000
--- a/themes/garland/screenshot.png
+++ /dev/null
Binary files differ
diff --git a/themes/garland/style-rtl.css b/themes/garland/style-rtl.css
deleted file mode 100644
index 58aed57..0000000
--- a/themes/garland/style-rtl.css
+++ /dev/null
@@ -1,344 +0,0 @@
-
-html {
- direction: rtl;
-}
-
-/**
- * Generic elements
- */
-body {
- direction: rtl;
-}
-
-ul,
-.block ul,
-ol {
- padding: 0 1.5em 0 0;
-}
-
-ul.menu,
-.item-list ul {
- margin: 0.35em -0.5em 0 0;
-}
-
-ol li,
-ul li,
-ul.menu li,
-.item-list ul li,
-li.leaf {
- margin: 0.15em .5em 0.15em 0;
-}
-
-ul li.collapsed {
- list-style-image: url(images/menu-collapsed-rtl.gif);
-}
-
-ul.inline li {
- padding: 0 0 0 1em;
-}
-
-ol.task-list {
- margin-left: 0;
- margin-right: 0;
-}
-
-ol.task-list li {
- padding: 0.5em 2em 0.5em 1em;
-}
-
-ol.task-list li.active {
- background: transparent url(images/task-list.png) no-repeat 97px 50%;
-}
-
-ol.task-list li.done {
- background: transparent url(../../misc/watchdog-ok.png) no-repeat 100% 50%;
-}
-
-ol.task-list li.active {
- margin-right: 0;
- margin-left: 1em;
-}
-
-dl {
- margin: 0.5em 1.5em 1em 0;
-}
-
-dl dt {
-}
-
-dl dd {
- margin: 0 1.5em .5em 0;
-}
-
-.messages li {
- padding: 0 1.3 0 0;
-}
-
-.form-button,
-.form-submit {
- margin: 0 0 0 0.5em;
-}
-
-.region-header h2 {
- margin: 0 0 0 1em;
-}
-
-#wrapper {
- background: #edf5fa url("images/body.png") repeat-x 50% 0;
-}
-
-#branding img {
- padding-right: 0;
- padding-left: 20px;
- float: right;
-}
-
-#wrapper #container #center {
- float: right;
-}
-
-body.sidebar-first #center {
- margin-left: 0;
- margin-right: -210px;
-}
-body.sidebar-second #center {
- margin-left: -210px;
- margin-right: 0;
-}
-
-/* And add blanks left and right for the sidebars to fill */
-body.sidebar-first #squeeze {
- margin-left: 0;
- margin-right: 210px;
-}
-body.sidebar-second #squeeze {
- margin-left: 210px;
- margin-right: 0;
-}
-
-#wrapper #container .sidebar {
- float: right;
-}
-
-#sidebar-first .block {
- padding: 0 0 0 15px;
-}
-
-#sidebar-second .block {
- padding: 0 15px 0 0;
-}
-
-
-
-#sidebar-first .block-region {
- margin: 0 0 0 15px;
-}
-
-#sidebar-second .block-region {
- margin: 0 15px 0px 0;
-}
-
-/* Now we add the backgrounds for the main content shading */
-#wrapper #container #center #squeeze {
- background: #fff url("images/bg-content.png") repeat-x 50% 0;
-}
-
-#wrapper #container .breadcrumb {
- position: absolute;
- top: 15px;
- left: 0;
- right: 35px;
- z-index: 3;
-}
-
-/**
- * Primary navigation
- */
-ul.main-menu {
- float: left;
- width:70%;
-}
-
-ul.main-menu li {
- float: right;
-}
-
-/**
- * Secondary navigation
- */
-ul.secondary-menu {
- float: left;
- clear: left;
- margin-left: 16em;
-}
-
-ul.secondary-menu li {
- float: right;
-}
-
-ul.primary {
- float: right;
-}
-ul.secondary {
- clear: both;
- text-align: right;
-}
-h1.with-tabs {
- float: right;
- margin: 0 0 0 2em;
-}
-
-ul.primary li a,
-ul.primary li.active a,
-ul.primary li a:hover,
-ul.primary li a:visited,
-ul.secondary li a,
-ul.secondary li.active a,
-ul.secondary li a:hover,
-ul.secondary li a:visited {
- margin: 0 1px 0 0;
-
-}
-ul.primary li a:after {
- /* Fix Firefox 2 RTL bug. */
- content: " ";
-}
-
-ul.links li, ul.inline li {
- padding-left: 1em;
- padding-right: 0;
-}
-
-.node .links,
-.comment .links {
- text-align: right;
- padding-right: 0;
-}
-
-.user-picture,
-.comment .submitted {
- padding-left: 0;
- float: left;
- clear: left;
- padding-right: 1em;
-}
-
-.new {
- float: left;
-}
-
-.indented {
- margin-left: 0;
- margin-right: 25px;
-}
-
-html.js fieldset.collapsible .fieldset-legend {
- padding-left: 0;
- padding-right: 2em;
- background: url("images/menu-expanded.gif") no-repeat 100% 50%;
-}
-
-html.js fieldset.collapsed .fieldset-legend {
- background: url("images/menu-collapsed-rtl.gif") no-repeat 100% 50%;
-}
-
-/**
- * Vertical tabs.
- */
-div.vertical-tabs {
- margin-left: 5%;
- margin-right: 15em;
-}
-
-/**
- * Syndication Block
- */
-#block-node-syndicate h2 {
- float: right;
- padding-right: 0;
- padding-left: 20px;
-}
-
-#block-node-syndicate img {
- float: left;
-}
-
-#block-node-syndicate .content {
- clear: left;
-}
-
-/**
- * Login Block
- */
-#user-login-form ul {
- text-align: right;
-}
-#user-login-form .openid-links {
- padding-left: 0;
- padding-right: 0.5em;
-}
-#user-login-form .openid-links li.user-link {
- padding-left: 0;
- padding-right: 1em;
-}
-
-div.admin .left {
- float: right;
-}
-
-div.admin .right {
- float: left;
-}
-
-/* Fix Opera, IE6 and IE7 header width */
-#wrapper #container #header {
- position: relative;
- width: 100%;
-}
-
-#wrapper #container #header #logo-floater {
- width: 100%;
- left: 0;
- top:0;
-}
-
-/**
- * Fixes for IE7 - Does not break other browsers
- */
-
-/* Position:relative on these breaks IE7. */
-ul.primary li a,
-ul.primary li.active a,
-ul.primary li a:hover,
-ul.primary li a:visited,
-ul.secondary li a,
-ul.secondary li.active a,
-ul.secondary li a:hover,
-ul.secondary li a:visited {
- position: static;
-}
-
-/* Fix right and left cloumns position breaking on window resize */
-#container {
- position: relative;
-}
-
-#center {
- position: relative;
-}
-
-#sidebar-second {
- position: absolute;
- right: 0;
-}
-
-/**
- * Apply hasLayout to elements in IE7, using standard property "min-height"
- * (see http://www.satzansatz.de/cssd/onhavinglayout.html)
- */
-
-/* Fix background bleed in center column. */
-#squeeze,
-#squeeze .right-corner {
- min-height: 1%;
-}
diff --git a/themes/garland/style.css b/themes/garland/style.css
deleted file mode 100644
index 079f8a3..0000000
--- a/themes/garland/style.css
+++ /dev/null
@@ -1,1255 +0,0 @@
-
-/**
- * Generic elements
- */
-body {
- margin: 0;
- padding: 0;
- background: #edf5fa;
- font: 76%/170% Verdana, sans-serif;
- color: #494949;
-}
-
-input {
- font: 1em/100% Verdana, sans-serif;
- color: #494949;
-}
-
-textarea,
-select {
- font: 1em/160% Verdana, sans-serif;
- color: #494949;
-}
-
-h1,
-h2,
-h3,
-h4,
-h5,
-h6 {
- margin: 0;
- padding: 0;
- font-weight: normal;
- font-family: Helvetica, Arial, sans-serif;
-}
-
-h1 {
- font-size: 170%;
-}
-
-h2,
-#center h1 {
- font-size: 160%;
- line-height: 130%;
-}
-
-h3 {
- font-size: 140%;
-}
-
-h4 {
- font-size: 130%;
-}
-
-h5 {
- font-size: 120%;
-}
-
-h6 {
- font-size: 110%;
-}
-
-quote,
-code,
-fieldset {
- margin: .5em 0;
-}
-
-code,
-pre,
-kbd {
- font-size: 115%;
-}
-
-p {
- margin: 0.6em 0 1.2em;
- padding: 0;
-}
-
-a:link,
-a:visited {
- color: #027AC6;
- text-decoration: none;
-}
-
-a:hover {
- color: #0062A0;
- text-decoration: underline;
-}
-
-a:active,
-a.active {
- color: #5895be;
-}
-
-hr {
- margin: 0;
- padding: 0;
- border: none;
- height: 1px;
- background: #5294c1;
-}
-
-ul,
-.block ul,
-ol {
- margin: 0.5em 0 1em;
- padding: 0 0 0 1.5em; /* LTR */
-}
-
-/* Default to menu leaf bullet for unordered list items. "ul" used here so it can cascade to list items and "li.leaf" to override the system leaf image. */
-ul,
-ul li.leaf {
- list-style-image: url(images/menu-leaf.gif);
-}
-
-/* This is used to cancel the list style image when an ordered list is embedded in an unordered list. */
-ol {
- list-style-image: none;
-}
-
-ul.menu,
-.item-list ul {
- margin: 0.35em 0 0 -0.5em; /* LTR */
-}
-
-ol li,
-ul li,
-ul.menu li,
-.item-list ul li,
-li.leaf {
- margin: 0.15em 0 0.15em .5em; /* LTR */
- padding-bottom: .1em;
-}
-
-ul li.expanded {
- list-style-image: url(images/menu-expanded.gif);
-}
-
-ul li.collapsed {
- list-style-image: url(images/menu-collapsed.gif); /* LTR */
-}
-
-ul li.leaf a,
-ul li.expanded a,
-ul li.collapsed a {
- display: block;
-}
-
-ul.inline li {
- background: none;
- margin: 0;
- padding: 0 1em 0 0; /* LTR */
-}
-
-ol.task-list {
- margin-left: 0; /* LTR */
- list-style-type: none;
- list-style-image: none;
-}
-ol.task-list li {
- padding: 0.5em 1em 0.5em 2em; /* LTR */
-}
-ol.task-list li.active {
- background: transparent url(images/task-list.png) no-repeat 3px 50%; /* LTR */
-}
-ol.task-list li.done {
- color: #393;
- background: transparent url(../../misc/watchdog-ok.png) no-repeat 0px 50%; /* LTR */
-}
-ol.task-list li.active {
- margin-right: 1em; /* LTR */
-}
-
-fieldset ul.clearfix li {
- margin: 0;
- padding: 0;
- background-image: none;
-}
-
-dl {
- margin: 0.5em 0 1em 1.5em; /* LTR */
-}
-
-dl dt {
-}
-
-dl dd {
- margin: 0 0 .5em 1.5em; /* LTR */
-}
-
-img,
-a img {
- border: none;
-}
-
-table {
- margin: 1em 0;
- width: 100%;
-}
-
-thead th {
- border-bottom: 2px solid #d3e7f4;
- color: #494949;
- font-weight: bold;
-}
-
-th a:link,
-th a:visited {
- color: #6f9dbd;
-}
-
-td,
-th {
- padding: .3em .5em;
-}
-
-tr.even,
-tr.odd,
-tbody th {
- border: solid #d3e7f4;
- border-width: 1px 0;
-}
-
-tr.odd,
-tr.info {
- background-color: #edf5fa;
-}
-
-tr.even {
- background-color: #fff;
-}
-
-tr.drag {
- background-color: #ffb;
-}
-
-tr.drag-previous {
- background-color: #ffd;
-}
-
-tr.odd td.active {
- background-color: #ddecf5;
-}
-
-tr.even td.active {
- background-color: #e6f1f7;
-}
-
-td.region-title,
-td.module,
-td.container,
-td.category {
- border-top: 1.5em solid #fff;
- border-bottom: 1px solid #b4d7f0;
- background-color: #d4e7f3;
- color: #455067;
- font-weight: bold;
-}
-
-tr:first-child td.region-title,
-tr:first-child td.module,
-tr:first-child td.container,
-tr:first-child td.category {
- border-top-width: 0;
-}
-
-abbr.form-required {
- color: #ffae00;
-}
-
-.submitted, .description,
-.vertical-tab-button .summary {
- font-size: 0.92em;
- color: #898989;
-}
-
-.description .more-help-link {
- font-size: 0.92em;
-}
-
-.description {
- line-height: 150%;
- margin-bottom: 0.75em;
- color: #898989;
-}
-
-.preview {
- margin: .75em 0 .75em;
- padding: .5em 1em;
-}
-
-.form-checkboxes,
-.form-radios,
-.form-checkboxes .form-item,
-.form-radios .form-item {
- margin: 0.25em 0;
-}
-
-#center form {
- margin-bottom: 2em;
-}
-
-.form-actions {
- margin: 2em 0 1em;
-}
-.form-button,
-.form-submit {
- margin: 0 0.5em 0 0; /* LTR */
-}
-
-/**
- * Skip link
- */
-#skip-link {
- left: 50%;
- margin-left: -5.25em;
- margin-top: 0;
- position: absolute;
- width: auto;
- z-index: 1000;
-}
-#skip-link a,
-#skip-link a:link,
-#skip-link a:visited {
- background: #444;
- background: rgba(0, 0, 0, 0.6);
- color: #fff;
- display: block;
- font-size: 0.94em;
- line-height: 1.7;
- margin-top: 1px;
- padding: 2px 10px;
- text-decoration: none;
- -khtml-border-radius: 0 0 2px 2px;
- -moz-border-radius: 0 0 2px 2px;
- -webkit-border-bottom-left-radius: 2px;
- -webkit-border-bottom-right-radius: 2px;
- -webkit-border-top-left-radius: 0;
- -webkit-border-top-right-radius: 0;
- border-radius: 0 0 2px 2px;
-}
-#skip-link a:hover,
-#skip-link a:active,
-#skip-link a:focus {
- outline: 0;
-}
-
-/**
- * Layout
- */
-.region-header {
- min-height: 1em;
- background: #d2e6f3 url(images/bg-navigation.png) repeat-x 50% 100%;
-}
-
-.region-header .block {
- display: block;
- margin: 0 1em;
-}
-
-.region-header .block-region {
- display: block;
- margin: 0 0.5em 1em;
- padding: 0.5em;
- position: relative;
- top: 0.5em;
-}
-
-.region-header * {
- display: inline;
- line-height: 1.5em;
- margin-top: 0;
- margin-bottom: 0;
-}
-
-/* Prevent the previous directive from showing the content of script elements in Mozilla browsers. */
-.region-header script {
- display: none;
-}
-
-.region-header p,
-.region-header img {
- margin-top: 0.5em;
-}
-
-.region-header h2 {
- margin: 0 1em 0 0; /* LTR */
-}
-
-.region-header h3,
-.region-header label,
-.region-header li {
- margin: 0 1em;
- padding: 0;
- background: none;
-}
-
-#wrapper {
- 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;
-}
-
-#wrapper #container #header {
- height: 80px;
-}
-
-#wrapper #container #header #logo-floater {
- position: absolute;
-}
-
-#branding,
-#branding a:link,
-#branding a:visited {
- line-height: 120px;
- position: relative;
- z-index: 2;
- white-space: nowrap;
-}
-
-#branding span {
- font-weight: bold;
-}
-
-#branding img {
- padding-top: 14px;
- padding-right: 20px; /* LTR */
- float: left; /* LTR */
-}
-
-/* With 3 columns, require a minimum width of 1000px to ensure there is enough horizontal space. */
-body.two-sidebars {
- min-width: 980px;
-}
-/* With 2 columns, require a minimum width of 800px. */
-body.sidebar-first,
-body.sidebar-second {
- min-width: 780px;
-}
-
-/* We must define 100% width to avoid the body being too narrow for near-empty pages */
-#wrapper #container #center {
- float: left; /* LTR */
- width: 100%;
-}
-
-/* So we move the #center container over the sidebars to compensate */
-body.sidebar-first #center {
- margin-left: -210px; /* LTR */
-}
-body.sidebar-second #center {
- margin-right: -210px; /* LTR */
-}
-body.two-sidebars #center {
- margin: 0 -210px;
-}
-
-/* And add blanks left and right for the sidebars to fill */
-body.sidebar-first #squeeze {
- margin-left: 210px; /* LTR */
-}
-body.sidebar-second #squeeze {
- margin-right: 210px; /* LTR */
-}
-body.two-sidebars #squeeze {
- margin: 0 210px;
-}
-
-/* We ensure the sidebars are still clickable using z-index */
-#wrapper #container .sidebar {
- margin: 60px 0 5em;
- width: 210px;
- float: left; /* LTR */
- z-index: 2;
- position: relative;
-}
-
-#wrapper #container .sidebar .block {
- margin: 0 0 1.5em 0;
-}
-
-#sidebar-first .block {
- padding: 0 15px 0 0; /* LTR */
-}
-
-#sidebar-second .block {
- padding: 0 0 0 15px; /* LTR */
-}
-
-.block .content {
- margin: 0.5em 0;
-}
-
-#sidebar-first .block-region {
- margin: 0 15px 0 0px; /* LTR */
-}
-
-#sidebar-second .block-region {
- margin: 0 0px 0 15px; /* LTR */
-}
-
-.block-region {
- padding: 1em;
- background: transparent;
- border: 2px dashed #b4d7f0;
- text-align: center;
- font-size: 1.3em;
-}
-
-/* Now we add the backgrounds for the main content shading */
-#wrapper #container #center #squeeze {
- background: #fff url(images/bg-content.png) repeat-x 50% 0;
- position: relative;
-}
-
-#wrapper #container #center .right-corner {
- background: transparent url(images/bg-content-right.png) no-repeat 100% 0;
- position: relative;
- left: 10px;
-}
-
-#wrapper #container #center .right-corner .left-corner {
- padding: 60px 25px 5em 35px;
- background: transparent url(images/bg-content-left.png) no-repeat 0 0;
- margin-left: -10px;
- position: relative;
- left: -10px;
- min-height: 400px;
-}
-
-#wrapper #container .region-footer {
- float: none;
- clear: both;
- text-align: center;
- margin: 4em 0 -3em;
- color: #898989;
-}
-
-#wrapper #container .breadcrumb {
- position: absolute;
- top: 15px;
- left: 35px; /* LTR */
- z-index: 3;
-}
-
-body.sidebar-first .region-footer {
- margin-left: -210px;
-}
-
-body.sidebar-second .region-footer {
- margin-right: -210px;
-}
-
-body.two-sidebars .region-footer {
- margin: 0 -210px;
-}
-
-/**
- * Header
- */
-div#branding {
- font-family: Helvetica,Arial,sans-serif;
-}
-
-div#branding strong {
- font-weight: normal;
-}
-
-#branding,
-#branding a:link,
-#branding a:visited {
- color: #fff;
- text-shadow: #1659ac 0px 1px 3px;
- font-size: 1.5em;
-}
-
-#branding a:hover {
- text-decoration: none;
-}
-
-#wrapper #container .breadcrumb {
- font-size: 0.92em;
-}
-
-#wrapper #container .breadcrumb,
-#wrapper #container .breadcrumb a {
- color: #529ad6;
-}
-
-#highlighted {
- padding: 1em;
- background-color: #fff;
- border: 1px solid #e0e5fb;
- margin-bottom: 2em;
-}
-
-/**
- * Overlay
- */
-#overlay #overlay-tabs li a {
- background: #d9eaf5;
- color: #000;
-}
-#overlay #overlay-tabs li a:hover,
-#overlay #overlay-tabs li a:focus {
- background: #fff;
-}
-#overlay #overlay-tabs li.active a {
- background: url("images/body.png") repeat-x scroll 50% -58px #edf5fa;
- color: #fff;
-}
-#overlay-content {
- padding: 1px;
-}
-#overlay-content #header {
- display: none;
-}
-#overlay-content #wrapper {
- background-position: 50% -80px;
-}
-
-
-/**
- * Primary navigation
- */
-ul.main-menu {
- margin: 0;
- padding: 0;
- float: right; /* LTR */
- position: relative;
- z-index: 4;
-}
-
-ul.main-menu li {
- margin: 0;
- padding: 0;
- float: left; /* LTR */
- background-image: none;
-}
-
-ul.main-menu li a,
-ul.main-menu li a:link,
-ul.main-menu li a:visited {
- display: block;
- margin: 0 1em;
- padding: .75em 0 0;
- color: #fff;
- background: transparent url(images/bg-navigation-item.png) no-repeat 50% 0;
-}
-
-ul.main-menu li a:hover,
-ul.main-menu li a.active {
- color: #fff;
- background: transparent url(images/bg-navigation-item-hover.png) no-repeat 50% 0;
-}
-
-/**
- * Secondary navigation
- */
-ul.secondary-menu {
- margin: 0;
- padding: 18px 0 0;
- float: right; /* LTR */
- clear: right; /* LTR */
- position: relative;
- z-index: 4;
-}
-
-ul.secondary-menu li {
- margin: 0;
- padding: 0;
- float: left; /* LTR */
- background-image: none;
-}
-
-ul.secondary-menu li a,
-ul.secondary-menu li a:link,
-ul.secondary-menu li a:visited {
- display: block;
- margin: 0 1em;
- padding: .75em 0 0;
- color: #cde3f1;
- background: transparent;
-}
-
-ul.secondary-menu li a:hover,
-ul.secondary-menu li a.active {
- color: #cde3f1;
- background: transparent;
-}
-
-/**
- * Local tasks
- */
-ul.primary,
-ul.primary li,
-ul.secondary,
-ul.secondary li {
- border: 0;
- background: none;
- margin: 0;
- padding: 0;
-}
-
-#tabs-wrapper {
- margin: 0 -26px 1em;
- padding: 0 26px;
- border-bottom: 1px solid #e9eff3;
- position: relative;
-}
-ul.primary {
- padding: 0.5em 0 10px;
- float: left; /* LTR */
-}
-ul.secondary {
- clear: both;
- text-align: left; /* LTR */
- border-bottom: 1px solid #e9eff3;
- margin: -0.2em -26px 1em;
- padding: 0 26px 0.6em;
-}
-h1.with-tabs {
- float: left; /* LTR */
- margin: 0 2em 0 0; /* LTR */
- padding: 0;
-}
-
-ul.primary li a,
-ul.primary li.active a,
-ul.primary li a:hover,
-ul.primary li a:visited,
-ul.secondary li a,
-ul.secondary li.active a,
-ul.secondary li a:hover,
-ul.secondary li a:visited {
- border: 0;
- background: transparent;
- padding: 4px 1em;
- margin: 0 0 0 1px; /* LTR */
- height: auto;
- text-decoration: none;
- position: relative;
- top: -1px;
- display: inline-block;
-}
-ul.primary li.active a,
-ul.primary li.active a:link,
-ul.primary li.active a:visited,
-ul.primary li a:hover,
-ul.secondary li.active a,
-ul.secondary li.active a:link,
-ul.secondary li.active a:visited,
-ul.secondary li a:hover {
- background: url(images/bg-tab.png) repeat-x 0 50%;
- color: #fff;
-}
-ul.primary li.active a,
-ul.secondary li.active a {
- font-weight: bold;
-}
-
-/**
- * Nodes & comments
- */
-.node {
- border-bottom: 1px solid #e9eff3;
- margin: 0 -16px 1.5em;
- padding: 1.5em 16px;
-}
-
-ul.links li,
-ul.inline li {
- margin-left: 0;
- margin-right: 0;
- padding-left: 0; /* LTR */
- padding-right: 1em; /* LTR */
- background-image: none;
-}
-
-.node .links,
-.comment .links {
- text-align: left; /* LTR */
- padding-left: 0; /* LTR */
-}
-
-.user-picture,
-.comment .submitted {
- float: right; /* LTR */
- clear: right; /* LTR */
- padding-left: 1em; /* LTR */
-}
-
-.new {
- color: #ffae00;
- font-size: 0.92em;
- font-weight: bold;
- float: right; /* LTR */
-}
-
-.preview .node,
-.preview .comment,
-.node-sticky {
- margin: 0;
- padding: 0.5em 0;
- border: 0;
- background: 0;
-}
-
-.node-sticky {
- padding: 1em;
- background-color: #fff;
- border: 1px solid #e0e5fb;
- margin-bottom: 2em;
-}
-
-#comments {
- position: relative;
- top: -1px;
- border-bottom: 1px solid #e9eff3;
- margin: 1.5em -25px 0;
- padding: 0 25px;
-}
-
-#comments h2.comments {
- margin: 0 -25px;
- padding: .5em 25px;
- background: #fff url(images/gradient-inner.png) repeat-x 0 0;
-}
-
-.comment {
- margin: 0 -25px;
- padding: 1.5em 25px 1.5em;
- border-top: 1px solid #e9eff3;
-}
-
-.indented {
- margin-left: 25px; /* LTR */
-}
-
-.comment h3 a.active {
- color: #494949;
-}
-
-.node .content,
-.comment .content {
- margin: 0.6em 0;
-}
-
-/**
- * Aggregator.module
- */
-.aggregator {
- margin-top: 1em;
-}
-.aggregator .feed-item-title {
- font-size: 160%;
- line-height: 130%;
-}
-.aggregator .feed-item {
- border-bottom: 1px solid #e9eff3;
- margin: -1.5em -31px 1.75em;
- padding: 1.5em 31px;
-}
-.aggregator .feed-item-categories {
- font-size: 0.92em;
-}
-.aggregator .feed-item-meta {
- font-size: 0.92em;
- color: #898989;
-}
-
-/**
- * Color.module
- */
-#palette .form-item {
- border: 1px solid #fff;
-}
-#palette .item-selected {
- background: #fff url(images/gradient-inner.png) repeat-x 0 0;
- border: 1px solid #d9eaf5;
-}
-
-/**
- * Menu.module
- */
-tr.odd td.menu-disabled {
- background-color: #edf5fa;
-}
-tr.even td.menu-disabled {
- background-color: #fff;
-}
-
-/**
- * Poll.module
- */
-.poll .bar {
- background: #fff url(images/bg-bar-white.png) repeat-x 0 0;
- border: solid #f0f0f0;
- border-width: 0 1px 1px;
-}
-
-.poll .bar .foreground {
- background: #71a7cc url(images/bg-bar.png) repeat-x 0 100%;
-}
-
-.poll .percent {
- font-size: .9em;
-}
-
-/**
- * Autocomplete.
- */
-#autocomplete li {
- cursor: default;
- padding: 2px;
- margin: 0;
-}
-
-/**
- * Collapsible fieldsets
- */
-fieldset {
- margin: 1em 0;
- padding: 1em;
- border: 1px solid #d9eaf5;
- background: #fff url(images/gradient-inner.png) repeat-x 0 0;
-}
-
-/* Targets IE 7. Fixes background image in field sets. */
-*:first-child+html fieldset {
- padding: 0 1em 1em;
- background-position: 0 .75em;
- background-color: transparent;
-}
-*:first-child+html .text-format-wrapper .filter-wrapper {
- padding: 1.5em 0 1.5em;
- background-position: 0 0;
-}
-
-/* Keep the background position at 0 for filters and vertical tabs. */
-*:first-child+html fieldset.filter-wrapper,
-*:first-child+html fieldset.vertical-tabs-pane {
- background-position: 0 0;
-}
-
-*:first-child+html fieldset .fieldset-wrapper .fieldset-description {
- padding-top: 1em;
-}
-
-html.js fieldset.collapsed {
- background: transparent;
- padding-top: 0;
- padding-bottom: .6em;
-}
-
-html.js fieldset.collapsible .fieldset-legend {
- padding-left: 2em; /* LTR */
- background: url(images/menu-expanded.gif) no-repeat 0% 50%; /* LTR */
-}
-html.js fieldset.collapsed .fieldset-legend {
- background: url(images/menu-collapsed.gif) no-repeat 0% 50%; /* LTR */
-}
-
-.fieldset-legend span.summary {
- color: #898989;
-}
-
-/**
- * Vertical tabs.
- */
-div.vertical-tabs {
- border-color: #d9eaf5;
-}
-
-div.vertical-tabs .vertical-tabs-panes fieldset.vertical-tabs-pane {
- padding: 0.5em 1em;
-}
-
-div.vertical-tabs ul.vertical-tabs-list {
- border-color: #d9eaf5;
-}
-
-div.vertical-tabs ul.vertical-tabs-list li {
- background-color: #edf5fa;
- border-color: #d9eaf5;
-}
-
-div.vertical-tabs ul.vertical-tabs-list li strong {
- font-weight: normal;
-}
-
-div.vertical-tabs ul.vertical-tabs-list li.selected strong {
- font-weight: bold;
-}
-
-div.vertical-tabs ul.vertical-tabs-list li.selected small {
- color: #898989;
-}
-
-div.vertical-tabs ul.vertical-tabs-list li.selected {
- background: #fff repeat-x 0 0;
-}
-
-div.vertical-tabs ul.vertical-tabs-list li.selected.first {
- background-image: url(images/gradient-inner.png);
-}
-
-div.vertical-tabs ul.vertical-tabs-list li.selected a strong {
- color: #494949;
-}
-
-/**
- * Syndication icons and block
- */
-#block-node-syndicate h2 {
- float: left; /* LTR */
- padding-right: 20px; /* LTR */
-}
-
-#block-node-syndicate img,
-.feed-icon {
- float: right; /* LTR */
- padding-top: 4px;
-}
-
-#block-node-syndicate .content {
- clear: right; /* LTR */
-}
-
-/**
- * Login Block
- */
-#user-login-form {
- text-align: center;
-}
-#user-login-form ul {
- text-align: left; /* LTR */
-}
-#user-login .openid-links {
- padding: 0;
-}
-#user-login-form .openid-links {
- padding-left: 0.5em; /* LTR */
-}
-#user-login-form .openid-links li.user-link {
- padding-left: 1em; /* LTR */
-}
-
-/**
- * User profiles.
- */
-.profile {
- margin-top: 1.5em;
-}
-.profile h3 {
- border-bottom: 0;
- margin-bottom: 1em;
-}
-.profile dl {
- margin: 0;
-}
-.profile dt {
- font-weight: normal;
- color: #898989;
- font-size: 0.92em;
- line-height: 1.3em;
- margin-top: 1.4em;
- margin-bottom: 0.45em;
-}
-.profile dd {
- margin-bottom: 1.6em;
-}
-
-/**
- * Admin Styles
- */
-div.admin-panel,
-div.admin-panel .description,
-div.admin-panel .body,
-div.admin,
-div.admin .left,
-div.admin .right,
-div.admin .expert-link,
-div.item-list,
-.menu {
- margin: 0;
- padding: 0;
-}
-
-div.admin .left {
- float: left; /* LTR */
- width: 48%;
-}
-div.admin .right {
- float: right; /* LTR */
- width: 48%;
-}
-
-div.admin-panel {
- background: #fff url(images/gradient-inner.png) repeat-x 0 0;
- padding: 1em 1em 1.5em;
-}
-div.admin-panel .description {
- margin-bottom: 1.5em;
-}
-div.admin-panel dl {
- margin: 0;
-}
-div.admin-panel dd {
- color: #898989;
- font-size: 0.92em;
- line-height: 1.3em;
- margin-top: -.2em;
- margin-bottom: .65em;
-}
-
-table.system-status-report th {
- border-color: #d3e7f4;
-}
-
-#autocomplete li.selected,
-tr.selected td,
-tr.selected td.active {
- background: #027ac6;
- color: #fff;
-}
-
-tr.selected td a:link,
-tr.selected td a:visited,
-tr.selected td a:active {
- color: #d3e7f4;
-}
-
-tr.taxonomy-term-preview {
- opacity: 0.5;
-}
-
-tr.taxonomy-term-divider-top {
- border-bottom: none;
-}
-
-tr.taxonomy-term-divider-bottom {
- border-top: 1px dotted #CCC;
-}
-
-.theme-selector h3 {
- margin: 10px 0;
-}
-.theme-selector .operations li {
- list-style-image: none;
-}
-
-/**
- * CSS support
- */
-
-/*******************************************************************
- * Color Module: Don't touch *
- *******************************************************************/
-
-/**
- * Generic elements.
- */
-.preview {
- background-color: #fcfce8;
- border: 1px solid #e5e58f;
-}
-
-.form-item input.error,
-.form-item textarea.error {
- border: 1px solid #c52020;
- color: #363636;
-}
-
-/**
- * dblog.module
- */
-tr.dblog-user {
- background-color: #fcf9e5;
-}
-
-tr.dblog-user td.active {
- background-color: #fbf5cf;
-}
-
-tr.dblog-content {
- background-color: #fefefe;
-}
-
-tr.dblog-content td.active {
- background-color: #f5f5f5;
-}
-
-tr.dblog-warning {
- background-color: #fdf5e6;
-}
-
-tr.dblog-warning td.active {
- background-color: #fdf2de;
-}
-
-tr.dblog-error {
- background-color: #fbe4e4;
-}
-
-tr.dblog-error td.active {
- background-color: #fbdbdb;
-}
-tr.dblog-page-not-found,
-tr.dblog-access-denied {
- background: #d7ffd7;
-}
-tr.dblog-page-not-found td.active,
-tr.dblog-access-denied td.active {
- background: #c7eec7;
-}
-
-/**
- * Status report colors.
- */
-table.system-status-report tr.error,
-table.system-status-report tr.error th {
- background-color: #fcc;
- border-color: #ebb;
- color: #200;
-}
-table.system-status-report tr.warning,
-table.system-status-report tr.warning th {
- background-color: #ffd;
- border-color: #eeb;
-}
-table.system-status-report tr.ok,
-table.system-status-report tr.ok th {
- background-color: #dfd;
- border-color: #beb;
-}
diff --git a/themes/garland/template.php b/themes/garland/template.php
deleted file mode 100644
index fc09571..0000000
--- a/themes/garland/template.php
+++ /dev/null
@@ -1,158 +0,0 @@
-<?php
-
-/**
- * Return a themed breadcrumb trail.
- *
- * @param $breadcrumb
- * An array containing the breadcrumb links.
- * @return a string containing the breadcrumb output.
- */
-function garland_breadcrumb($variables) {
- $breadcrumb = $variables['breadcrumb'];
-
- if (!empty($breadcrumb)) {
- // Provide a navigational heading to give context for breadcrumb links to
- // screen-reader users. Make the heading invisible with .element-invisible.
- $output = '<h2 class="element-invisible">' . t('You are here') . '</h2>';
-
- $output .= '<div class="breadcrumb">' . implode(' › ', $breadcrumb) . '</div>';
- return $output;
- }
-}
-
-/**
- * Override or insert variables into the maintenance page template.
- */
-function garland_preprocess_maintenance_page(&$vars) {
- // While markup for normal pages is split into page.tpl.php and html.tpl.php,
- // the markup for the maintenance page is all in the single
- // maintenance-page.tpl.php template. So, to have what's done in
- // garland_preprocess_html() also happen on the maintenance page, it has to be
- // called here.
- garland_preprocess_html($vars);
-}
-
-/**
- * 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) {
- // Hook into color.module
- if (module_exists('color')) {
- _color_html_alter($vars);
- }
-}
-
-/**
- * Override or insert variables into the page template.
- */
-function garland_preprocess_page(&$vars) {
- // Move secondary tabs into a separate variable.
- $vars['tabs2'] = array(
- '#theme' => 'menu_local_tasks',
- '#secondary' => $vars['tabs']['#secondary'],
- );
- unset($vars['tabs']['#secondary']);
-
- if (isset($vars['main_menu'])) {
- $vars['primary_nav'] = theme('links__system_main_menu', array(
- 'links' => $vars['main_menu'],
- 'attributes' => array(
- 'class' => array('links', 'inline', 'main-menu'),
- ),
- 'heading' => array(
- 'text' => t('Main menu'),
- 'level' => 'h2',
- 'class' => array('element-invisible'),
- )
- ));
- }
- else {
- $vars['primary_nav'] = FALSE;
- }
- if (isset($vars['secondary_menu'])) {
- $vars['secondary_nav'] = theme('links__system_secondary_menu', array(
- 'links' => $vars['secondary_menu'],
- 'attributes' => array(
- 'class' => array('links', 'inline', 'secondary-menu'),
- ),
- 'heading' => array(
- 'text' => t('Secondary menu'),
- 'level' => 'h2',
- 'class' => array('element-invisible'),
- )
- ));
- }
- else {
- $vars['secondary_nav'] = FALSE;
- }
-
- // Prepare header.
- $site_fields = array();
- if (!empty($vars['site_name'])) {
- $site_fields[] = $vars['site_name'];
- }
- if (!empty($vars['site_slogan'])) {
- $site_fields[] = $vars['site_slogan'];
- }
- $vars['site_title'] = implode(' ', $site_fields);
- if (!empty($site_fields)) {
- $site_fields[0] = '<span>' . $site_fields[0] . '</span>';
- }
- $vars['site_html'] = implode(' ', $site_fields);
-
- // Set a variable for the site name title and logo alt attributes text.
- $slogan_text = $vars['site_slogan'];
- $site_name_text = $vars['site_name'];
- $vars['site_name_and_slogan'] = $site_name_text . ' ' . $slogan_text;
-}
-
-/**
- * Override or insert variables into the node template.
- */
-function garland_preprocess_node(&$vars) {
- $vars['submitted'] = $vars['date'] . ' — ' . $vars['name'];
-}
-
-/**
- * Override or insert variables into the comment template.
- */
-function garland_preprocess_comment(&$vars) {
- $vars['submitted'] = $vars['created'] . ' — ' . $vars['author'];
-}
-
-/**
- * Override or insert variables into the block template.
- */
-function garland_preprocess_block(&$vars) {
- $vars['title_attributes_array']['class'][] = 'title';
- $vars['classes_array'][] = 'clearfix';
-}
-
-/**
- * Override or insert variables into the page template.
- */
-function garland_process_page(&$vars) {
- // Hook into color.module
- if (module_exists('color')) {
- _color_page_alter($vars);
- }
-}
-
-/**
- * Override or insert variables into the region template.
- */
-function garland_preprocess_region(&$vars) {
- if ($vars['region'] == 'header') {
- $vars['classes_array'][] = 'clearfix';
- }
-}
diff --git a/themes/garland/theme-settings.php b/themes/garland/theme-settings.php
deleted file mode 100644
index 2454341..0000000
--- a/themes/garland/theme-settings.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-
-/**
- * @file
- * Theme setting callbacks for the garland theme.
- */
-
-/**
- * Implements hook_form_FORM_ID_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,
- );
-}