diff options
| author | Mary Umoh <umohm12@gmail.com> | 2017-06-21 22:18:56 +0200 |
|---|---|---|
| committer | Dylan William Hardison <dylan@hardison.net> | 2017-06-21 22:18:56 +0200 |
| commit | 74f15e52e9ac43d4e47d08337aa6574899c00090 (patch) | |
| tree | 5efdff69fe72d2714670a70ad0d2a88f5733acfc /extensions | |
| parent | d6f40ea57141f9b94910eb7600efbe9c5e006249 (diff) | |
| download | bugzilla-74f15e52e9ac43d4e47d08337aa6574899c00090.tar.gz bugzilla-74f15e52e9ac43d4e47d08337aa6574899c00090.tar.xz | |
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
Diffstat (limited to 'extensions')
5 files changed, 7 insertions, 7 deletions
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") %] diff --git a/extensions/BugModal/template/en/default/bug_modal/header.html.tmpl b/extensions/BugModal/template/en/default/bug_modal/header.html.tmpl index 94b9d57fc..20f1aebb0 100644 --- a/extensions/BugModal/template/en/default/bug_modal/header.html.tmpl +++ b/extensions/BugModal/template/en/default/bug_modal/header.html.tmpl @@ -66,7 +66,7 @@ style_urls.push( "extensions/BugModal/web/bug_modal.css", "extensions/BugModal/web/dropdown.css", - "skins/custom/bug_groups.css", + "skins/standard/bug_groups.css", "js/jquery/plugins/datetimepicker/datetimepicker.css", "js/jquery/plugins/contextMenu/contextMenu.css" ); diff --git a/extensions/MozProjectReview/template/en/default/bug/create/create-moz-project-review.html.tmpl b/extensions/MozProjectReview/template/en/default/bug/create/create-moz-project-review.html.tmpl index 64b4f3073..f2cd15d39 100644 --- a/extensions/MozProjectReview/template/en/default/bug/create/create-moz-project-review.html.tmpl +++ b/extensions/MozProjectReview/template/en/default/bug/create/create-moz-project-review.html.tmpl @@ -11,7 +11,7 @@ [% PROCESS global/header.html.tmpl title = "Mozilla Project Review" generate_api_token = 1 - style_urls = [ 'skins/custom/create_bug.css', + style_urls = [ 'skins/standard/create_bug.css', 'extensions/MozProjectReview/web/style/moz_project_review.css' 'js/jquery/plugins/datetimepicker/datetimepicker.css' ] javascript_urls = [ 'js/field.js', 'js/util.js', diff --git a/extensions/Splinter/template/en/default/pages/splinter.html.tmpl b/extensions/Splinter/template/en/default/pages/splinter.html.tmpl index c2640b422..df5dd75ce 100644 --- a/extensions/Splinter/template/en/default/pages/splinter.html.tmpl +++ b/extensions/Splinter/template/en/default/pages/splinter.html.tmpl @@ -28,7 +28,7 @@ generate_api_token = 1 header = "Patch Review" style_urls = [ "extensions/Splinter/web/splinter.css", - "skins/custom/bug_groups.css" ] + "skins/standard/bug_groups.css" ] javascript_urls = [ "js/yui.js", "extensions/Splinter/web/splinter.js", "js/field.js" ] |