From 74f15e52e9ac43d4e47d08337aa6574899c00090 Mon Sep 17 00:00:00 2001 From: Mary Umoh Date: Wed, 21 Jun 2017 16:18:56 -0400 Subject: Bug 1369872 - Combine skins/custom/Mozilla/*.css and skins/contrib/*.css into skins/standard/*.css * Move bug_groups from custom to standard * More modified bug_group files * Combine skin CSS files * Move .png files to standard * Move css from global.css that belongs in index.css * Changes to css placement * All images within skins/standard moved to images folder * Fix font issue * Updates * Updates * Fix mistake --- .../BMO/template/en/default/bug/create/create-legal.html.tmpl | 2 +- .../BMO/template/en/default/hook/global/header-start.html.tmpl | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'extensions/BMO') diff --git a/extensions/BMO/template/en/default/bug/create/create-legal.html.tmpl b/extensions/BMO/template/en/default/bug/create/create-legal.html.tmpl index 73d4d2b4d..bc8356c7b 100644 --- a/extensions/BMO/template/en/default/bug/create/create-legal.html.tmpl +++ b/extensions/BMO/template/en/default/bug/create/create-legal.html.tmpl @@ -40,7 +40,7 @@ label.required:before { generate_api_token = 1 style = inline_style style_urls = [ 'skins/standard/attachment.css', - 'skins/custom/create_bug.css' ] + 'skins/standard/create_bug.css' ] javascript_urls = [ 'js/attachment.js', 'js/field.js' ] %] diff --git a/extensions/BMO/template/en/default/hook/global/header-start.html.tmpl b/extensions/BMO/template/en/default/hook/global/header-start.html.tmpl index 0243345bb..a9d3146f1 100644 --- a/extensions/BMO/template/en/default/hook/global/header-start.html.tmpl +++ b/extensions/BMO/template/en/default/hook/global/header-start.html.tmpl @@ -19,15 +19,15 @@ [% END %] [%# Change the background/border for bugs/attachments in certain bug groups %] -[% IF template.name == 'attachment/edit.html.tmpl' +[% IF template.name == 'attachment/edit.html.tmpl' || template.name == 'attachment/create.html.tmpl' || template.name == 'attachment/diff-header.html.tmpl' %] - [% style_urls.push("skins/custom/bug_groups.css") %] + [% style_urls.push("skins/standard/bug_groups.css") %] [% IF template.name == 'attachment/edit.html.tmpl' || template.name == 'attachment/diff-header.html.tmpl' %] [% IF bodyclasses == 'no_javascript' %] - [% bodyclasses = ['no_javascript'] %] + [% bodyclasses = ['no_javascript'] %] [% END %] [% FOREACH group = attachment.bug.groups_in %] [% bodyclasses.push("bz_group_$group.name") %] -- cgit v1.2.3-24-g4f1b