#99763 by kkaefer. The menus are a system-level thing, and their css should be too.

3 files changed, 48 insertions, 51 deletions

diff --git a/modules/menu/menu.css b/modules/menu/menu.css
deleted file mode 100644
index d815cfdb2..000000000
--- a/modules/menu/menu.css
+++ /dev/null
@@ -1,46 +0,0 @@
-/* $Id$ */
-
-ul.menu {
-  list-style: none;
-  border: none;
-  text-align:left;
-}
-ul.menu li {
-  margin: 0 0 0 0.5em;
-}
-li.expanded {
-  list-style-type: circle;
-  list-style-image: url(../../misc/menu-expanded.png);
-  padding: 0.2em 0.5em 0 0;
-  margin: 0;
-}
-li.collapsed {
-  list-style-type: disc;
-  list-style-image: url(../../misc/menu-collapsed.png);
-  padding: 0.2em 0.5em 0 0;
-  margin: 0;
-}
-li.leaf {
-  list-style-type: square;
-  list-style-image: url(../../misc/menu-leaf.png);
-  padding: 0.2em 0.5em 0 0;
-  margin: 0;
-}
-li a.active {
-  color: #000;
-}
-td.menu-disabled {
-  background: #ccc;
-}
-ul.links {
-  margin: 0;
-  padding: 0;
-}
-ul.links.inline {
-  display: inline;
-}
-ul.links li {
-  display: inline;
-  list-style-type: none;
-  padding: 0 0.5em;
-}
diff --git a/modules/menu/menu.module b/modules/menu/menu.module
index 46ad75ca1..f4e1ac8c3 100644
--- a/modules/menu/menu.module
+++ b/modules/menu/menu.module
@@ -105,11 +105,6 @@ function menu_menu($may_cache) {
       'weight' => 5,
     );
   }
-  else {
-    // Add the CSS for this module
-    // We put this in !$may_cache so it's only added once per request
-    drupal_add_css(drupal_get_path('module', 'menu') .'/menu.css');
-  }
 
   return $items;
 }
diff --git a/modules/system/system.css b/modules/system/system.css
index 5a92c5a89..43794a4c8 100644
--- a/modules/system/system.css
+++ b/modules/system/system.css
@@ -156,6 +156,54 @@ dl.multiselect .form-item {
 }
 
 /*
+** Menus
+*/
+ul.menu {
+  list-style: none;
+  border: none;
+  text-align:left;
+}
+ul.menu li {
+  margin: 0 0 0 0.5em;
+}
+li.expanded {
+  list-style-type: circle;
+  list-style-image: url(../../misc/menu-expanded.png);
+  padding: 0.2em 0.5em 0 0;
+  margin: 0;
+}
+li.collapsed {
+  list-style-type: disc;
+  list-style-image: url(../../misc/menu-collapsed.png);
+  padding: 0.2em 0.5em 0 0;
+  margin: 0;
+}
+li.leaf {
+  list-style-type: square;
+  list-style-image: url(../../misc/menu-leaf.png);
+  padding: 0.2em 0.5em 0 0;
+  margin: 0;
+}
+li a.active {
+  color: #000;
+}
+td.menu-disabled {
+  background: #ccc;
+}
+ul.links {
+  margin: 0;
+  padding: 0;
+}
+ul.links.inline {
+  display: inline;
+}
+ul.links li {
+  display: inline;
+  list-style-type: none;
+  padding: 0 0.5em;
+}
+
+/*
 ** Tab navigation
 */
 ul.primary {