diff options
| author | Byron Jones <glob@mozilla.com> | 2014-05-22 07:57:28 +0200 |
|---|---|---|
| committer | Byron Jones <glob@mozilla.com> | 2014-05-22 07:57:42 +0200 |
| commit | 7f29dd34a78737967912f7c7156451facde7051d (patch) | |
| tree | cfede92913fb60de31fb23a63bf2528434f53294 /template/en | |
| parent | 54cc754a164f2ee7249b716239b53ca42cc0650a (diff) | |
| download | bugzilla-7f29dd34a78737967912f7c7156451facde7051d.tar.gz bugzilla-7f29dd34a78737967912f7c7156451facde7051d.tar.xz | |
Bug 1014374: backport bug 977969 to bmo (concatenate and slightly minify css files)
Diffstat (limited to 'template/en')
| -rw-r--r-- | template/en/default/global/header.html.tmpl | 49 |
1 files changed, 6 insertions, 43 deletions
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. %] - <link href="[% 'skins/standard/global.css' FILTER mtime FILTER html %]" - 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 %] @@ -393,29 +379,6 @@ <div id="message">[% message %]</div> [% END %] -[% BLOCK format_css_link %] - [% IF style_url.match('/IE-fixes\.css') %] - <!--[if lte IE 7]> - [%# Internet Explorer treats [if IE] HTML comments as uncommented. - # We use it to import CSS fixes so that Bugzilla looks decent on IE 7 - # and below. - #%] - [% END %] - - [% 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 %]> - - [% '<![endif]-->' IF style_url.match('/IE-fixes\.css') %] -[% END %] - [% BLOCK format_js_link %] <script type="text/javascript" src="[% javascript_url FILTER mtime FILTER html %]"></script> [% END %] |