Merge branch 'MDL-46022-master' of git://github.com/jethac/moodle

Conflicts:
	theme/bootstrapbase/less/moodle/modules.less
	theme/bootstrapbase/style/moodle.css
This commit is contained in:
Damyon Wiese 2014-06-24 14:10:51 +08:00
commit d9640a99ba
6 changed files with 80 additions and 13 deletions

View file

@ -832,6 +832,26 @@ x#fitem_id_availabilityconditionsjson input[type=text] {
#custommenu .yui3-menu .yui3-menu .yui3-menu-label {background-image:url([[pix:theme|vertical-menu-submenu-indicator]]); padding-right: 20px;}
#custommenu .yui3-menu .yui3-menu .yui3-menu-label-menuvisible {background-image:url([[pix:theme|horizontal-menu-submenu-indicator]]);}
/**
* Dividers.
*/
.yui3-menu.yui3-menu-horizontal .yui3-menuitem.divider {
overflow: hidden;
width: 0;
height: 24px;
border-left: 1px solid #ddd;
}
.yui3-menu .yui3-menu .yui3-menuitem.divider {
width: auto;
height: 0;
margin: 4px 1px;
border-left: 0px none;
border-top: 1px solid #ddd;
}
.yui3-menu .yui3-menuitem.divider a {
visibility: invisible;
}
/**
* Smart Select Element
*/