summaryrefslogtreecommitdiffstats
path: root/template/en/default
diff options
context:
space:
mode:
authorByron Jones <glob@mozilla.com>2014-05-14 07:35:25 +0200
committerByron Jones <glob@mozilla.com>2014-05-14 07:35:25 +0200
commit6d3857e31ab6d39625c2b5703a876d0b13930c18 (patch)
tree339102a76092e470644970679a37481d0163afc6 /template/en/default
parentfca0b6cb7133f458352bd8547195f7f0822766f8 (diff)
downloadbugzilla-6d3857e31ab6d39625c2b5703a876d0b13930c18.tar.gz
bugzilla-6d3857e31ab6d39625c2b5703a876d0b13930c18.tar.xz
Bug 977969: concatenate and slightly minify css files
r=gerv, a=glob
Diffstat (limited to 'template/en/default')
-rw-r--r--template/en/default/global/header.html.tmpl40
1 files changed, 6 insertions, 34 deletions
diff --git a/template/en/default/global/header.html.tmpl b/template/en/default/global/header.html.tmpl
index 427934264..e6bd8f45d 100644
--- a/template/en/default/global/header.html.tmpl
+++ b/template/en/default/global/header.html.tmpl
@@ -90,35 +90,20 @@
[% PROCESS 'global/setting-descs.none.tmpl' %]
[% SET yui = yui_resolve_deps(yui, yui_deps) %]
- [% SET css_sets = css_files(style_urls, yui, yui_css) %]
-
- [%# CSS cascade, parts 1 & 2: YUI & Standard Bugzilla stylesheet set (persistent).
- # Always present. %]
- <link href="[% 'skins/standard/global.css' FILTER mtime FILTER html %]"
- rel="alternate stylesheet"
- title="[% setting_descs.standard FILTER html %]">
- [% FOREACH style_url = css_sets.standard %]
- [% PROCESS format_css_link css_set_name = 'standard' %]
- [% END %]
- [%# CSS cascade, part 3: Third-party stylesheet set, per user prefs. %]
- [% FOREACH style_url = css_sets.skin %]
- [% PROCESS format_css_link css_set_name = user.settings.skin.value %]
- [% END %]
+ [% SET css_sets = css_files(style_urls, yui, yui_css) %]
+ <link href="[% css_sets.unified_standard_skin FILTER html %]"
+ rel="stylesheet" type="text/css">
- [%# CSS cascade, part 4: page-specific styles. %]
[% IF style %]
<style type="text/css">
[% style %]
</style>
[% END %]
- [%# CSS cascade, part 5: Custom Bugzilla stylesheet set (persistent).
- # Always present. Site administrators may override all other style
- # definitions, including skins, using custom stylesheets.
- #%]
- [% FOREACH style_url = css_sets.custom %]
- [% PROCESS format_css_link css_set_name = 'standard' %]
+ [% IF css_sets.unified_custom %]
+ <link href="[% css_sets.unified_custom FILTER html %]"
+ rel="stylesheet" type="text/css">
[% END %]
[%# YUI Scripts %]
@@ -265,19 +250,6 @@
<div id="message">[% message %]</div>
[% END %]
-[% BLOCK format_css_link %]
- [% IF css_set_name == 'standard' %]
- [% SET css_title_link = '' %]
- [% ELSE %]
- [% css_title_link = BLOCK ~%]
- title="[% setting_descs.${user.settings.skin.value} || user.settings.skin.value FILTER html %]"
- [% END %]
- [% END %]
-
- <link href="[% style_url FILTER html %]" rel="stylesheet"
- type="text/css" [% css_title_link FILTER none %]>
-[% END %]
-
[% BLOCK format_js_link %]
<script type="text/javascript" src="[% javascript_url FILTER mtime FILTER html %]"></script>
[% END %]