Merge branch 'MDL-49214_master' of git://github.com/lazydaisy/moodle

This commit is contained in:
Eloy Lafuente (stronk7) 2015-03-03 19:34:49 +01:00
commit 9c3df39d63
3 changed files with 16 additions and 3 deletions

View file

@ -2301,7 +2301,7 @@ body.lockscroll {
.dir-rtl {
// Bootstrap sets right margin to 0. Fail.
// They set left margin to 25px so we will copy that.
ul, ol {
ul {
margin-left: 0;
margin-right: 25px;
}

View file

@ -188,4 +188,17 @@ body:not(.jsenabled) .langmenu:hover > .dropdown-menu,
display: block;
max-height: 150px;
overflow-y: auto;
}
// Extends bootstrapbase/less/bootstrap/type.less
// to enable ol lists to use a larger number set.
ol {
margin: 0 0 @baseLineHeight / 2 2.5em;
}
.dir-rtl {
ol {
margin: 0 2.5em @baseLineHeight / 2 0;
}
}

File diff suppressed because one or more lines are too long