- Fix missing progressbar background after CSS split

- Keep all JS widget css together

3 files changed, 22 insertions, 23 deletions

diff --git a/modules/system/admin.css b/modules/system/admin.css
index 1d7842534..ba564c2ac 100644
--- a/modules/system/admin.css
+++ b/modules/system/admin.css
@@ -1,26 +1,4 @@
 /*
-** Progressbar styles
-*/
-.progress {
-  font-weight: bold;
-}
-.progress .bar {
-  background: #fff url(progress.gif);
-  border: 1px solid #00375a;
-  height: 1.5em;
-  margin-top: 0.2em;
-}
-.progress .filled {
-  background: #0072b9;
-  height: 1em;
-  border-bottom: 0.5em solid #004a73;
-  width: 0%;
-}
-.progress .percentage {
-  float: right;
-}
-
-/*
 ** Formatting for administration page
 */
 div.admin-panel {
diff --git a/modules/system/system.css b/modules/system/system.css
index 669aa3439..1daac9103 100644
--- a/modules/system/system.css
+++ b/modules/system/system.css
@@ -257,6 +257,28 @@ html.js fieldset.collapsed legend a {
 }
 
 /*
+** Progressbar styles
+*/
+.progress {
+  font-weight: bold;
+}
+.progress .bar {
+  background: #fff url(../../misc/progress.gif);
+  border: 1px solid #00375a;
+  height: 1.5em;
+  margin-top: 0.2em;
+}
+.progress .filled {
+  background: #0072b9;
+  height: 1em;
+  border-bottom: 0.5em solid #004a73;
+  width: 0%;
+}
+.progress .percentage {
+  float: right;
+}
+
+/*
 ** Formatting for welcome page
 */
 #first-time strong {
diff --git a/update.php b/update.php
index 873841038..039e882ac 100644
--- a/update.php
+++ b/update.php
@@ -402,7 +402,6 @@ function update_progress_page() {
   // Prevent browser from using cached drupal.js or update.js
   drupal_add_js('misc/progress.js', TRUE);
   drupal_add_js('misc/update.js', TRUE);
-  drupal_add_css(drupal_get_path('module', 'system') .'/admin.css', 'core');
 
   drupal_set_title('Updating');
   $output = '<div id="progress"></div>';