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

This commit is contained in:
Damyon Wiese 2014-06-24 10:38:48 +08:00
commit c32161a82c
3 changed files with 32 additions and 7 deletions

View File

@ -246,6 +246,22 @@ div#dock {
width: 100%;
}
// Dropdown styling.
.dropdown-menu {
> li > a {
padding: 3px 20px 3px 8px;
}
}
.dir-rtl .dropdown-menu {
> li > a {
padding: 3px 8px 3px 20px;
}
}
.dir-rtl .dropdown-submenu > .dropdown-menu {
.border-radius(6px 0px 6px 6px);
}
// Survey module
.path-mod-survey {
@ -270,4 +286,11 @@ div#dock {
}
}
}
}
.nav .caret {
margin-left: 4px;
}
.dir-rtl .nav .caret {
margin-right: 4px;
}

View File

@ -394,23 +394,25 @@
.dropdown-menu {
right:0;
left:auto;
margin-right: 0px;
}
.navbar .nav>li>.dropdown-menu:before {
.navbar .nav > li > .dropdown-menu:before {
right:9px;
left:auto;
}
.navbar .nav>li>.dropdown-menu:after {
.navbar .nav > li > .dropdown-menu:after {
right: 10px;
left:auto;
}
.dropdown-submenu>a:after {
margin-right: -10px;
margin-left: 0;
.dropdown-submenu > a:after {
margin-right: 0;
margin-left: -10px;
float: left;
border-right-color: #ccc;
border-left-color: transparent;
border-width: 5px 5px 5px 0px;
}
.dropdown-submenu>.dropdown-menu {
.dropdown-submenu > .dropdown-menu {
right:100%;
left:auto;
}

File diff suppressed because one or more lines are too long