diff --git a/includes/theme.maintenance.inc b/includes/theme.maintenance.inc index 9496f38..cf3fb4c 100644 --- a/includes/theme.maintenance.inc +++ b/includes/theme.maintenance.inc @@ -32,7 +32,7 @@ function _drupal_maintenance_theme() { // Install and update pages are treated differently to prevent theming overrides. if (defined('MAINTENANCE_MODE') && (MAINTENANCE_MODE == 'install' || MAINTENANCE_MODE == 'update')) { - $theme = 'minnelli'; + $theme = 'garland'; } else { if (!db_is_active()) { @@ -45,7 +45,7 @@ function _drupal_maintenance_theme() { drupal_load('module', 'filter'); } - $theme = variable_get('maintenance_theme', 'minnelli'); + $theme = variable_get('maintenance_theme', 'garland'); } $themes = list_themes(); diff --git a/modules/update/update.compare.inc b/modules/update/update.compare.inc index 1c2e818..f52f022 100644 --- a/modules/update/update.compare.inc +++ b/modules/update/update.compare.inc @@ -157,7 +157,7 @@ function update_get_project_name($file) { elseif (isset($file->info['package']) && (strpos($file->info['package'], 'Core -') !== FALSE)) { $project_name = 'drupal'; } - elseif (in_array($file->name, array('bluemarine', 'chameleon', 'garland', 'marvin', 'minnelli', 'pushbutton'))) { + elseif (in_array($file->name, array('bluemarine', 'chameleon', 'garland', 'marvin', 'pushbutton'))) { // Unfortunately, there's no way to tell if a theme is part of core, // so we must hard-code a list here. $project_name = 'drupal'; diff --git a/sites/default/default.settings.php b/sites/default/default.settings.php index 70c6480..3fd5691 100644 --- a/sites/default/default.settings.php +++ b/sites/default/default.settings.php @@ -202,7 +202,7 @@ ini_set('url_rewriter.tags', ''); */ # $conf = array( # 'site_name' => 'My Drupal site', -# 'theme_default' => 'minnelli', +# 'theme_default' => 'garland', # 'anonymous' => 'Visitor', /** * A custom theme can be set for the off-line page. This applies when the site @@ -212,7 +212,7 @@ ini_set('url_rewriter.tags', ''); * theme. It is located inside 'modules/system/maintenance-page.tpl.php'. * Note: This setting does not apply to installation and update pages. */ -# 'maintenance_theme' => 'minnelli', +# 'maintenance_theme' => 'garland', /** * reverse_proxy accepts a boolean value. * diff --git a/themes/garland/minnelli/color/base.png b/themes/garland/minnelli/color/base.png deleted file mode 100644 index ef1df36..0000000 Binary files a/themes/garland/minnelli/color/base.png and /dev/null differ diff --git a/themes/garland/minnelli/color/color.inc b/themes/garland/minnelli/color/color.inc deleted file mode 100644 index a05fe66..0000000 --- a/themes/garland/minnelli/color/color.inc +++ /dev/null @@ -1,74 +0,0 @@ - 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 deleted file mode 100644 index b7e9a1a..0000000 Binary files a/themes/garland/minnelli/color/preview.png and /dev/null differ diff --git a/themes/garland/minnelli/logo.png b/themes/garland/minnelli/logo.png deleted file mode 100644 index 3529fef..0000000 Binary files a/themes/garland/minnelli/logo.png and /dev/null differ diff --git a/themes/garland/minnelli/minnelli.css b/themes/garland/minnelli/minnelli.css deleted file mode 100644 index cec148c..0000000 --- a/themes/garland/minnelli/minnelli.css +++ /dev/null @@ -1,19 +0,0 @@ - -/** - * Minnelli, for Drupal 6.x - * Stefan Nagtegaal, iStyledThis [dot] nl - * Steven Wittens, acko [dot] net - */ - -body #wrapper #container { - width: 560px; -} - -body.sidebars #wrapper #container { - width: 980px; -} - -body.sidebar-left #wrapper #container, -body.sidebar-right #wrapper #container { - width: 770px; -} diff --git a/themes/garland/minnelli/minnelli.info b/themes/garland/minnelli/minnelli.info deleted file mode 100644 index 529dddb..0000000 --- a/themes/garland/minnelli/minnelli.info +++ /dev/null @@ -1,12 +0,0 @@ -name = Minnelli -description = Tableless, recolorable, multi-column, fixed width theme. -version = VERSION -core = 6.x -base theme = garland -stylesheets[all][] = minnelli.css - -; Information added by Drupal.org packaging script on 2016-02-24 -version = "6.38" -project = "drupal" -datestamp = "1456343372" - diff --git a/themes/garland/minnelli/screenshot.png b/themes/garland/minnelli/screenshot.png deleted file mode 100644 index e858b38..0000000 Binary files a/themes/garland/minnelli/screenshot.png and /dev/null differ