Merge branch 'MDL-40674_master' of https://github.com/nadavkav/moodle

Conflicts:
	theme/bootstrapbase/style/moodle.css
This commit is contained in:
Sam Hemelryk
2014-04-15 16:47:38 +12:00
2 changed files with 27 additions and 1 deletions
@@ -374,6 +374,32 @@
}
}
.dir-rtl {
.dropdown-menu {
right:0;
left:auto;
}
.navbar .nav>li>.dropdown-menu:before {
right:9px;
left:auto;
}
.navbar .nav>li>.dropdown-menu:after {
right: 10px;
left:auto;
}
.dropdown-submenu>a:after {
margin-right: -10px;
margin-left: 0;
border-right-color: #ccc;
border-left-color: transparent;
border-width: 5px 5px 5px 0px;
}
.dropdown-submenu>.dropdown-menu {
right:100%;
left:auto;
}
}
@media (max-width: 979px) {
.nav-collapse {
height: 0;
File diff suppressed because one or more lines are too long