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

6 files changed, 37 insertions, 37 deletions

diff --git a/template/en/default/account/prefs/mfa.html.tmpl b/template/en/default/account/prefs/mfa.html.tmpl
index 5bdd8ddaa..fc748cdd1 100644
--- a/template/en/default/account/prefs/mfa.html.tmpl
+++ b/template/en/default/account/prefs/mfa.html.tmpl
@@ -167,7 +167,7 @@
     <div id="mfa-enable-totp" style="display:none">
 
       <div id="mfa-totp-throbber">
-        Generating new QR code.. <img src="skins/standard/throbber.gif" width="16" height="11">
+        Generating new QR code.. <img src="../../images/throbber.gif" width="16" height="11">
       </div>
 
       <div id="mfa-totp-issued" style="display:none">
diff --git a/template/en/default/admin/params/general.html.tmpl b/template/en/default/admin/params/general.html.tmpl
index c19cf1407..f1b86e19f 100644
--- a/template/en/default/admin/params/general.html.tmpl
+++ b/template/en/default/admin/params/general.html.tmpl
@@ -19,17 +19,17 @@
   #                 Frédéric Buclin <LpSolit@gmail.com>
   #%]
 
-[% 
+[%
    title = "General"
-   desc = "Miscellaneous general settings that are not required." 
+   desc = "Miscellaneous general settings that are not required."
 %]
 
 [% param_descs = {
-  maintainer => 
+  maintainer =>
     "The email address of the person who maintains this installation "
     _ " of ${terms.Bugzilla}.",
 
-  docs_urlbase => 
+  docs_urlbase =>
     "The URL that is the common initial leading part of all"
     _ " $terms.Bugzilla documentation URLs. It may be an absolute URL,"
     _ " or a URL relative to the <tt>urlbase</tt> parameter. Leave this"
@@ -37,7 +37,7 @@
     _ "'%lang%' will be replaced by user's preferred language (if"
     _ " documentation is available in that language).",
 
-  utf8 => 
+  utf8 =>
     "Use UTF-8 (Unicode) encoding for all text in ${terms.Bugzilla}. New"
     _ " installations should set this to true to avoid character encoding"
     _ " problems. <strong>Existing databases should set this to true"
@@ -48,12 +48,12 @@
     _ " &quot;on&quot;, you must re-run <kbd>checksetup.pl</kbd> immediately"
     _ " afterward.</p>",
 
-  shutdownhtml => 
+  shutdownhtml =>
     "If this field is non-empty, then $terms.Bugzilla will be completely"
     _ " disabled and this text will be displayed instead of all the"
     _ " $terms.Bugzilla pages.",
 
-  announcehtml => 
+  announcehtml =>
     "If this field is non-empty, then $terms.Bugzilla will"
     _ " display whatever is in this field at the top of every"
     _ " HTML page. The HTML you put in this field is not wrapped or"
@@ -61,11 +61,11 @@
     _ "<tt>&lt;div&gt;</tt>. Give the div <em>id=\"message\"</em> to get"
     _ " green text inside a red box, or <em>class=\"bz_private\"</em> for"
     _ " dark red on a red background.  Anything defined in "
-    _ " <tt>skins/standard/global.css</tt> or <tt>skins/custom/global.css</tt>"
+    _ " <tt>skins/standard/global.css</tt>"
     _ " will work.  To get centered text, use <em>style=\"text-align: "
     _  " center;\"</em>.",
 
-  upgrade_notification => 
+  upgrade_notification =>
     "$terms.Bugzilla can inform you when a new release is available."
     _ " The notification will appear on the $terms.Bugzilla homepage,"
     _ " for administrators only."
diff --git a/template/en/default/bug/create/create.html.tmpl b/template/en/default/bug/create/create.html.tmpl
index ab95c38a7..d969ded64 100644
--- a/template/en/default/bug/create/create.html.tmpl
+++ b/template/en/default/bug/create/create.html.tmpl
@@ -33,7 +33,7 @@
   generate_api_token = 1
   style_urls = [ 'skins/standard/attachment.css',
                  'skins/standard/enter_bug.css',
-                 'skins/custom/create_bug.css' ]
+                 'skins/standard/create_bug.css' ]
   javascript_urls = [ "js/attachment.js", "js/util.js",
                       "js/field.js", "js/TUI.js", "js/bug.js",
                       "js/create_bug.js" ]
@@ -154,8 +154,8 @@ function set_assign_to() {
         for (var i = 0; i < flag_rows.length; i++) {
             // Each flag table row should have one flag form select element
             // We get the flag type id from the id attribute of the select.
-            var flag_select = YAHOO.util.Dom.getElementsByClassName('flag_select', 
-                                                                    'select', 
+            var flag_select = YAHOO.util.Dom.getElementsByClassName('flag_select',
+                                                                    'select',
                                                                     flag_rows[i])[0];
             var type_id = flag_select.id.split('-')[1];
             var can_set = flag_select.options.length > 1 ? 1 : 0;
@@ -181,7 +181,7 @@ function set_assign_to() {
 
 var status_comment_required = new Array();
 [% FOREACH status = bug_status %]
-  status_comment_required['[% status.name FILTER js %]'] = 
+  status_comment_required['[% status.name FILTER js %]'] =
     [% status.comment_required_on_change_from() ? 'true' : 'false' %]
 [% END %]
 
@@ -218,7 +218,7 @@ TUI_hide_default('attachment_text_field');
              value="Hide Advanced Fields" onClick="toggleAdvancedFields()">
       [%# Show the link if the browser supports JS %]
       <script type="text/javascript">
-        YAHOO.util.Dom.removeClass('expert_fields_controller', 
+        YAHOO.util.Dom.removeClass('expert_fields_controller',
                                    'bz_default_hidden');
       </script>
     </td>
@@ -245,7 +245,7 @@ TUI_hide_default('attachment_text_field');
     [% INCLUDE "bug/field-label.html.tmpl"
       field = bug_fields.component editable = 1
       desc_url = component_desc_url
-    %]      
+    %]
     <td id="field_container_component">
       <select name="component" id="component" onchange="set_assign_to();"
               size="7" aria-required="true" class="required">
@@ -278,7 +278,7 @@ TUI_hide_default('attachment_text_field');
 
       <script type="text/javascript">
        <!--
-         [%+ INCLUDE "bug/field-events.js.tmpl" 
+         [%+ INCLUDE "bug/field-events.js.tmpl"
                      field = bug_fields.component, product = product %]
        //-->
        </script>
@@ -302,7 +302,7 @@ TUI_hide_default('attachment_text_field');
 
   <tr>
     [% INCLUDE "bug/field-label.html.tmpl"
-      field = bug_fields.version editable = 1 rowspan = 3 
+      field = bug_fields.version editable = 1 rowspan = 3
     %]
     <td rowspan="3">
       <select name="version" id="version" size="5">
@@ -316,7 +316,7 @@ TUI_hide_default('attachment_text_field');
     </td>
 
     [% INCLUDE bug/field.html.tmpl
-      bug = default, field = bug_fields.bug_severity, editable = 1, 
+      bug = default, field = bug_fields.bug_severity, editable = 1,
       value = default.bug_severity %]
   </tr>
 
@@ -372,7 +372,7 @@ TUI_hide_default('attachment_text_field');
 
     [% IF Param('letsubmitterchoosepriority') %]
       [% INCLUDE bug/field.html.tmpl
-        bug = default, field = bug_fields.priority, editable = 1, 
+        bug = default, field = bug_fields.priority, editable = 1,
         value = default.priority %]
     [% ELSE %]
       <td colspan="2">&nbsp;</td>
@@ -414,7 +414,7 @@ TUI_hide_default('attachment_text_field');
       [% END %]
       <noscript>(Leave blank to assign to component's default assignee)</noscript>
     </td>
-  
+
 [% IF Param("useqacontact") %]
     [% INCLUDE "bug/field-label.html.tmpl"
       field = bug_fields.qa_contact editable = 1
@@ -436,7 +436,7 @@ TUI_hide_default('attachment_text_field');
 
   <tr>
     [% INCLUDE "bug/field-label.html.tmpl"
-      field = bug_fields.cc editable = 1 
+      field = bug_fields.cc editable = 1
     %]
     <td>
       [% INCLUDE global/userselect.html.tmpl
@@ -493,10 +493,10 @@ TUI_hide_default('attachment_text_field');
       <td colspan="3">
         <div id="possible_duplicates"></div>
         <script type="text/javascript">
-          var dt_columns = [ 
+          var dt_columns = [
               { key: "id", label: "[% field_descs.bug_id FILTER js %]",
                 formatter: YAHOO.bugzilla.dupTable.formatBugLink },
-              { key: "summary", 
+              { key: "summary",
                 label: "[% field_descs.short_desc FILTER js %]",
                 formatter: "text" },
               { key: "status",
@@ -582,7 +582,7 @@ TUI_hide_default('attachment_text_field');
                    [% ' checked="checked"' IF comment_is_private %]
                    onClick="updateCommentTagControl(this, 'comment')">
             <label for="comment_is_private">
-              Make this attachment and [% terms.bug %] description private (visible only 
+              Make this attachment and [% terms.bug %] description private (visible only
               to members of the <strong>[% Param('insidergroup') FILTER html %]</strong> group)
             </label>
           [% END %]
@@ -664,8 +664,8 @@ TUI_hide_default('attachment_text_field');
   [% NEXT IF field.hidden %]
   [% SET value = ${field.name}.defined ? ${field.name} : "" %]
   <tr [% 'class="expert_fields"' IF !field.is_mandatory %]>
-    [% INCLUDE bug/field.html.tmpl 
-      bug = default, field = field, value = value, editable = 1, 
+    [% INCLUDE bug/field.html.tmpl
+      bug = default, field = field, value = value, editable = 1,
       value_span = 3 %]
   </tr>
 [% END %]
@@ -728,7 +728,7 @@ TUI_hide_default('attachment_text_field');
     <th>&nbsp;</th>
     <td colspan="3">
         <strong>
-          Only users in all of the selected groups can view this 
+          Only users in all of the selected groups can view this
           [%+ terms.bug %]:
         </strong>
       <br>
@@ -801,7 +801,7 @@ TUI_hide_default('attachment_text_field');
     field = field editable = 1
   %]
   <td>
-    <select name="[% field.name FILTER html %]" 
+    <select name="[% field.name FILTER html %]"
             id="[% field.name FILTER html %]">
     [%- FOREACH x = ${field.name} %]
       [% NEXT IF NOT x.is_active %]
diff --git a/template/en/default/bug/show-header.html.tmpl b/template/en/default/bug/show-header.html.tmpl
index 2aac89ddb..2fbc7ef51 100644
--- a/template/en/default/bug/show-header.html.tmpl
+++ b/template/en/default/bug/show-header.html.tmpl
@@ -76,8 +76,8 @@
     [% javascript FILTER none %]
   [% END %]
 [% END %]
-[% style_urls = [ "skins/standard/show_bug.css", 
-                  "skins/custom/bug_groups.css" ] %]
+[% style_urls = [ "skins/standard/show_bug.css",
+                  "skins/standard/bug_groups.css" ] %]
 [% doc_section = "bug_page.html" %]
 [% bodyclasses = ['bz_bug',
                   "bz_status_$bug.bug_status",
diff --git a/template/en/default/global/header.html.tmpl b/template/en/default/global/header.html.tmpl
index ac753dca9..107c69069 100644
--- a/template/en/default/global/header.html.tmpl
+++ b/template/en/default/global/header.html.tmpl
@@ -200,8 +200,8 @@
 
     [%# this puts the live bookmark up on firefox for the Atom feed %]
     [% IF atomlink %]
-       <link rel="alternate" 
-             type="application/atom+xml" title="Atom feed" 
+       <link rel="alternate"
+             type="application/atom+xml" title="Atom feed"
              href="[% atomlink FILTER html %]">
     [% END %]
 
@@ -296,9 +296,9 @@
               </li>
             [% ELSE %]
                 [%# Only display one login form when we're on a LOGIN_REQUIRED page. That
-                # way, we're guaranteed that the user will use the form that has 
+                # way, we're guaranteed that the user will use the form that has
                 # hidden_fields in it (the center form) instead of this one. Also, it's
-                # less confusing to have one form (as opposed to  three) when you're 
+                # less confusing to have one form (as opposed to  three) when you're
                 # required to log in.
                 #%]
                 [% IF user.authorizer.can_login && !Bugzilla.page_requires_login %]
@@ -310,7 +310,7 @@
       </td>
       <td id="moz_tab">
         <a href="https://www.mozilla.org/" title="Mozilla - Home of the Mozilla Project">
-          <img src="skins/contrib/Mozilla/tabzilla.png" border="0" height="42" width="154"></a>
+          <img src="images/tabzilla.png" border="0" height="42" width="154"></a>
       </td>
     </tr>
     </table>
diff --git a/template/en/default/mfa/duo/verify.html.tmpl b/template/en/default/mfa/duo/verify.html.tmpl
index 627b82039..77f87cd65 100644
--- a/template/en/default/mfa/duo/verify.html.tmpl
+++ b/template/en/default/mfa/duo/verify.html.tmpl
@@ -37,7 +37,7 @@ $(function() {
 [% css = BLOCK %]
 
   #duo_container {
-    background: #fff url(skins/standard/throbber.gif) 10px 10px no-repeat;
+    background: #fff url(../../images/throbber.gif) 10px 10px no-repeat;
     width: 620px;
     height: 330px;
     border: 1px solid #000;