diff options
| author | Dries Buytaert <dries@buytaert.net> | 2004-02-15 14:21:37 +0000 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2004-02-15 14:21:37 +0000 |
| commit | b13a4cb2e3bf6d9dd887335aa6c64c31a2768134 (patch) | |
| tree | 6b0901466b45ba4a1fb02699c7fa02923a5509d6 /themes/chameleon | |
| parent | 8bab140a2af1ed58b05db3733627480c58458c20 (diff) | |
| download | brdo-b13a4cb2e3bf6d9dd887335aa6c64c31a2768134.tar.gz brdo-b13a4cb2e3bf6d9dd887335aa6c64c31a2768134.tar.bz2 | |
- Changed the directory structure of theme chameleon. Each template is now
in a subdirectory. This makes it easier to clone/fork an existing theme.
Diffstat (limited to 'themes/chameleon')
| -rw-r--r-- | themes/chameleon/chameleon.theme | 11 | ||||
| -rw-r--r-- | themes/chameleon/common.css (renamed from themes/chameleon/default.css) | 0 | ||||
| -rw-r--r-- | themes/chameleon/images/marvin-bullet.png | bin | 210 -> 0 bytes | |||
| -rw-r--r-- | themes/chameleon/marvin/bullet.png (renamed from themes/chameleon/images/druplicon-watermark.png) | bin | 2454 -> 2454 bytes | |||
| -rw-r--r-- | themes/chameleon/marvin/chameleon.css (renamed from themes/chameleon/marvin.css) | 2 | ||||
| -rw-r--r-- | themes/chameleon/marvin/druplicon-watermark.png | bin | 0 -> 2454 bytes | |||
| -rw-r--r-- | themes/chameleon/pure/background.gif (renamed from themes/chameleon/images/pure-background.gif) | bin | 594 -> 594 bytes | |||
| -rw-r--r-- | themes/chameleon/pure/chameleon.css (renamed from themes/chameleon/pure.css) | 2 |
8 files changed, 8 insertions, 7 deletions
diff --git a/themes/chameleon/chameleon.theme b/themes/chameleon/chameleon.theme index c9f2ada39..b5326e426 100644 --- a/themes/chameleon/chameleon.theme +++ b/themes/chameleon/chameleon.theme @@ -22,12 +22,13 @@ function chameleon_settings() { $fd = opendir('themes/chameleon'); while ($file = readdir($fd)) { - if (strstr($file, 'css') && $file != 'default.css') { - $files["themes/chameleon/$file"] = "themes/chameleon/$file"; + if (is_dir("themes/chameleon/$file") && !in_array($file, array('.', '..', 'CVS'))) { + $files["themes/chameleon/$file/chameleon.css"] = "themes/chameleon/$file/chameleon.css"; } } + closedir($fd); - $output = form_select(t('CSS stylesheet'), 'chameleon_stylesheet', variable_get('chameleon_stylesheet', 'themes/chameleon/default.css'), $files, t('Selecting a different stylesheet will change the look and feel of your site.')); + $output = form_select(t('CSS stylesheet'), 'chameleon_stylesheet', variable_get('chameleon_stylesheet', 'themes/chameleon/pure/chameleon.css'), $files, t('Selecting a different stylesheet will change the look and feel of your site.')); return $output; } @@ -45,8 +46,8 @@ function chameleon_page($content, $title = NULL, $breadcrumb = NULL) { $output .= "<head>\n"; $output .= " <title>". ($title ? $title ." | ". variable_get("site_name", "drupal") : variable_get("site_name", "drupal") ." | ". variable_get("site_slogan", "")) ."</title>\n"; $output .= drupal_get_html_head(); - $output .= " <link rel=\"stylesheet\" type=\"text/css\" href=\"themes/chameleon/default.css\" />\n"; - $output .= " <link rel=\"stylesheet\" type=\"text/css\" href=\"". variable_get("chameleon_stylesheet", "themes/chameleon/pure.css") ."\" />\n"; + $output .= " <link rel=\"stylesheet\" type=\"text/css\" href=\"themes/chameleon/common.css\" />\n"; + $output .= " <link rel=\"stylesheet\" type=\"text/css\" href=\"". variable_get("chameleon_stylesheet", "themes/chameleon/pure/chameleon.css") ."\" />\n"; $output .= "</head>"; $output .= "<body ". theme_onload_attribute() .">\n"; $output .= " <div id=\"header\">"; diff --git a/themes/chameleon/default.css b/themes/chameleon/common.css index 8c3d36926..8c3d36926 100644 --- a/themes/chameleon/default.css +++ b/themes/chameleon/common.css diff --git a/themes/chameleon/images/marvin-bullet.png b/themes/chameleon/images/marvin-bullet.png Binary files differdeleted file mode 100644 index 937c8ed05..000000000 --- a/themes/chameleon/images/marvin-bullet.png +++ /dev/null diff --git a/themes/chameleon/images/druplicon-watermark.png b/themes/chameleon/marvin/bullet.png Binary files differindex 4f91cd380..4f91cd380 100644 --- a/themes/chameleon/images/druplicon-watermark.png +++ b/themes/chameleon/marvin/bullet.png diff --git a/themes/chameleon/marvin.css b/themes/chameleon/marvin/chameleon.css index ba1f1d3e0..67ef9ea63 100644 --- a/themes/chameleon/marvin.css +++ b/themes/chameleon/marvin/chameleon.css @@ -78,7 +78,7 @@ table { padding: 0.5em; } .item-list ul li { - list-style-image: url(images/marvin-bullet.png); + list-style-image: url(marvin/bullet.png); } .path, .path a, .path a:visited { color: #888; diff --git a/themes/chameleon/marvin/druplicon-watermark.png b/themes/chameleon/marvin/druplicon-watermark.png Binary files differnew file mode 100644 index 000000000..4f91cd380 --- /dev/null +++ b/themes/chameleon/marvin/druplicon-watermark.png diff --git a/themes/chameleon/images/pure-background.gif b/themes/chameleon/pure/background.gif Binary files differindex 13e3631da..13e3631da 100644 --- a/themes/chameleon/images/pure-background.gif +++ b/themes/chameleon/pure/background.gif diff --git a/themes/chameleon/pure.css b/themes/chameleon/pure/chameleon.css index f41f692a5..d5c03ca14 100644 --- a/themes/chameleon/pure.css +++ b/themes/chameleon/pure/chameleon.css @@ -10,7 +10,7 @@ a:visited { } body { padding: 5em 0 0 3em; - background-image: url(images/pure-background.gif); + background-image: url(pure/background.gif); background-repeat: repeat-x; font-family: tahoma, verdana, arial, helvetica; border-top: 10px solid gray; |
