Commit 7d6b6552 authored by webchick's avatar webchick
Browse files

Issue #1813854 by sun, jessebeach: Simplify and improve default CSS styling for menus.

parent f3434e56
...@@ -56,19 +56,13 @@ th { ...@@ -56,19 +56,13 @@ th {
*/ */
ul.menu { ul.menu {
text-align:right; margin-left: 0;
} margin-right: 1em;
ul.menu li { text-align: right;
margin: 0 0.5em 0 0;
} }
ul li.collapsed { .menu .collapsed {
list-style-image: url(../../misc/menu-collapsed-rtl.png); list-style-image: url(../../misc/menu-collapsed-rtl.png);
} }
li.expanded,
li.collapsed,
li.leaf {
padding: 0.2em 0 0 0.5em;
}
/** /**
* Markup generated by theme_menu_local_tasks(). * Markup generated by theme_menu_local_tasks().
......
...@@ -250,37 +250,26 @@ th.checkbox { ...@@ -250,37 +250,26 @@ th.checkbox {
* Markup generated by theme_menu_tree(). * Markup generated by theme_menu_tree().
*/ */
ul.menu { ul.menu {
border: none; list-style: none outside;
list-style: none; margin-left: 1em; /* LTR */
padding: 0;
text-align: left; /* LTR */ text-align: left; /* LTR */
} }
ul.menu li { .menu .expanded {
margin: 0 0 0 0.5em; /* LTR */
}
ul li.expanded {
list-style-image: url(../../misc/menu-expanded.png); list-style-image: url(../../misc/menu-expanded.png);
list-style-type: circle; list-style-type: circle;
} }
ul li.collapsed { .menu .collapsed {
list-style-image: url(../../misc/menu-collapsed.png); /* LTR */ list-style-image: url(../../misc/menu-collapsed.png); /* LTR */
list-style-type: disc; list-style-type: disc;
} }
ul li.leaf { ul.menu li {
list-style-image: url(../../misc/menu-leaf.png); padding-top: 0.2em;
list-style-type: square;
}
li.expanded,
li.collapsed,
li.leaf {
padding: 0.2em 0.5em 0 0; /* LTR */
margin: 0; margin: 0;
} }
li a.active { ul.menu a.active {
color: #000; color: #000;
} }
td.menu-disabled {
background: #ccc;
}
/** /**
* Markup generated by theme_links(). * Markup generated by theme_links().
......
...@@ -72,7 +72,6 @@ tr, ...@@ -72,7 +72,6 @@ tr,
th, th,
td, td,
/* Drupal: system-menus.css */ /* Drupal: system-menus.css */
td.menu-disabled,
ul.links, ul.links,
ul.links.inline, ul.links.inline,
ul.links li, ul.links li,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment