From 7f29dd34a78737967912f7c7156451facde7051d Mon Sep 17 00:00:00 2001 From: Byron Jones Date: Thu, 22 May 2014 13:57:28 +0800 Subject: Bug 1014374: backport bug 977969 to bmo (concatenate and slightly minify css files) --- template/en/default/global/header.html.tmpl | 49 ++++------------------------- 1 file changed, 6 insertions(+), 43 deletions(-) (limited to 'template') diff --git a/template/en/default/global/header.html.tmpl b/template/en/default/global/header.html.tmpl index c5b2c126a..d6fc78b11 100644 --- a/template/en/default/global/header.html.tmpl +++ b/template/en/default/global/header.html.tmpl @@ -108,34 +108,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. %] - - [% 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) %] + - [%# CSS cascade, part 4: page-specific styles. %] [% IF 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 %] + [% END %] [%# YUI Scripts %] @@ -393,29 +379,6 @@
[% message %]
[% END %] -[% BLOCK format_css_link %] - [% IF style_url.match('/IE-fixes\.css') %] - ' IF style_url.match('/IE-fixes\.css') %] -[% END %] - [% BLOCK format_js_link %] [% END %] -- cgit v1.2.3-24-g4f1b