diff options
| author | Gábor Hojtsy <gabor@hojtsy.hu> | 2007-07-01 23:27:32 +0000 |
|---|---|---|
| committer | Gábor Hojtsy <gabor@hojtsy.hu> | 2007-07-01 23:27:32 +0000 |
| commit | 5e5a07f513ee793a8bbe5094895b4ebd5a1de8a2 (patch) | |
| tree | daf309c4579f62bf80b3c7461d39a5835f20706a /themes | |
| parent | 3409019929da282bca397ccfa64985c5d74394f9 (diff) | |
| download | brdo-5e5a07f513ee793a8bbe5094895b4ebd5a1de8a2.tar.gz brdo-5e5a07f513ee793a8bbe5094895b4ebd5a1de8a2.tar.bz2 | |
#141725 by Crell and dvessel: allow themes to define multiple CSS and JS files in their .info files, which can be clearly overriden
Diffstat (limited to 'themes')
| -rw-r--r-- | themes/chameleon/chameleon.info | 2 | ||||
| -rw-r--r-- | themes/chameleon/chameleon.theme | 2 | ||||
| -rw-r--r-- | themes/garland/garland.info | 2 | ||||
| -rw-r--r-- | themes/garland/page.tpl.php | 1 |
4 files changed, 4 insertions, 3 deletions
diff --git a/themes/chameleon/chameleon.info b/themes/chameleon/chameleon.info index 2103648dd..4a6850e4d 100644 --- a/themes/chameleon/chameleon.info +++ b/themes/chameleon/chameleon.info @@ -7,5 +7,7 @@ features[] = logo features[] = favicon features[] = name features[] = slogan +stylesheets[all][] = style.css +stylesheets[all][] = common.css version = VERSION core = 6.x diff --git a/themes/chameleon/chameleon.theme b/themes/chameleon/chameleon.theme index aa7405540..7433ed8ef 100644 --- a/themes/chameleon/chameleon.theme +++ b/themes/chameleon/chameleon.theme @@ -29,8 +29,6 @@ function chameleon_page($content, $show_blocks = TRUE, $show_messages = TRUE) { drupal_set_html_head('<link rel="shortcut icon" href="'. check_url(theme_get_setting('favicon')) .'" type="image/x-icon" />'); } - drupal_add_css(path_to_theme() .'/common.css', 'theme'); - $title = drupal_get_title(); // Get blocks before so that they can alter the header (JavaScript, Stylesheets etc.) diff --git a/themes/garland/garland.info b/themes/garland/garland.info index 32c000d92..3a5d3bb7c 100644 --- a/themes/garland/garland.info +++ b/themes/garland/garland.info @@ -4,3 +4,5 @@ description = Tableless, recolorable, multi-column, fluid width theme (default). version = VERSION core = 6.x engine = phptemplate +stylesheets[all][] = style.css +stylesheets[print][] = print.css diff --git a/themes/garland/page.tpl.php b/themes/garland/page.tpl.php index 5f6078228..bba6c898c 100644 --- a/themes/garland/page.tpl.php +++ b/themes/garland/page.tpl.php @@ -6,7 +6,6 @@ <?php print $head ?> <?php print $styles ?> <?php print $scripts ?> - <style type="text/css" media="print">@import "<?php print base_path() . path_to_theme() ?>/print.css";</style> <!--[if lt IE 7]> <style type="text/css" media="all">@import "<?php print base_path() . path_to_theme() ?>/fix-ie.css";</style> <![endif]--> |