From 74f15e52e9ac43d4e47d08337aa6574899c00090 Mon Sep 17 00:00:00 2001
From: Mary Umoh <umohm12@gmail.com>
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
---
 template/en/default/admin/params/general.html.tmpl | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'template/en/default/admin')

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."
-- 
cgit v1.2.3-24-g4f1b