Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

- Patch #309784 by Darren Oh: unordered lists override numbered lists.

merge-requests/26/head
Dries Buytaert 2008-12-19 15:42:26 +00:00
parent da4cd3cc8c
commit c43e4639d7
4 changed files with 21 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/book/book-rtl.css
View File

@ -1,5 +1,9 @@
/* $Id$ */
.book-navigation .menu {
padding: 1em 3em 0 0;
}
.book-navigation .page-previous {
float: right;
}

2
modules/book/book.css
View File

@ -2,7 +2,7 @@
.book-navigation .menu {
border-top: 1px solid #888;
padding: 1em 0 0 3em;
padding: 1em 0 0 3em; /* LTR */
}
.book-navigation .page-links {
border-top: 1px solid #888;

25
themes/garland/style-rtl.css
View File

@ -11,39 +11,20 @@ body {
direction: rtl;
}
ol li, ul li {
margin: 0.4em .5em 0.4em 0;
ul, .block ul, ol {
padding: 0 1.5em 0 0;
}
ul.menu, .item-list ul {
margin: 0.35em -0.5em 0 0;
}
ul.menu ul, .item-list ul ul {
margin-left: 0;
margin-right: 0em;
}
ol li, ul li, ul.menu li, .item-list ul li, li.leaf {
margin: 0.15em .5em 0.15em 0;
}
ul li, ul.menu li, .item-list ul li, li.leaf {
padding: 0 1.5em .2em 0;
background: transparent url("images/menu-leaf.gif") no-repeat 100% .5em;
}
ol li {
margin-left: 0;
margin-right: 2em;
}
ul li.expanded {
background: transparent url("images/menu-expanded.gif") no-repeat 100% .35em;
}
ul li.collapsed {
background: transparent url("images/menu-collapsed-rtl.gif") no-repeat 100% .4em;
list-style-image: url(images/menu-collapsed-rtl.gif);
}
ul.inline li {

41
themes/garland/style.css
View File

@ -53,7 +53,7 @@ h6 {
font-size: 110%;
}
ul, quote, code, fieldset {
quote, code, fieldset {
margin: .5em 0;
}
@ -84,51 +84,36 @@ hr {
background: #5294c1;
}
ul {
ul, .block ul, ol {
margin: 0.5em 0 1em;
padding: 0;
padding: 0 0 0 1.5em; /* LTR */
}
/* Default to menu leaf bullet for unordered list items. "ul" used here so it can cascade to list items and "li.leaf" to override the system leaf image. */
ul, li.leaf {
list-style-image: url(images/menu-leaf.gif);
}
/* This is used to cancel the list style image when an ordered list is embedded in an unordered list. */
ol {
margin: 0.75em 0 1.25em;
padding: 0;
}
ol li, ul li {
margin: 0.4em 0 0.4em .5em; /* LTR */
list-style-image: none;
}
ul.menu, .item-list ul {
margin: 0.35em 0 0 -0.5em; /* LTR */
padding: 0;
}
ul.menu ul, .item-list ul ul {
margin-left: 0em; /* LTR */
}
ol li, ul li, ul.menu li, .item-list ul li, li.leaf {
margin: 0.15em 0 0.15em .5em; /* LTR */
}
ul li, ul.menu li, .item-list ul li, li.leaf {
padding: 0 0 .2em 1.5em;
list-style-type: none;
list-style-image: none;
background: transparent url(images/menu-leaf.gif) no-repeat 1px .5em; /* LTR */
}
ol li {
padding: 0 0 .3em;
margin-left: 2em; /* LTR */
padding-bottom: .1em;
}
ul li.expanded {
background: transparent url(images/menu-expanded.gif) no-repeat 1px .35em; /* LTR */
list-style-image: url(images/menu-expanded.gif);
}
ul li.collapsed {
background: transparent url(images/menu-collapsed.gif) no-repeat 0px .4em; /* LTR */
list-style-image: url(images/menu-collapsed.gif); /* LTR */
}
ul li.leaf a, ul li.expanded a, ul li.collapsed a {