Commit c556c5fc authored by David Monllaó's avatar David Monllaó
Browse files

Merge branch 'MDL-50497-M28' of git://github.com/lazydaisy/moodle into MOODLE_28_STABLE

Conflicts:
	theme/bootstrapbase/style/moodle.css
parents 7b15a363 5856c769
......@@ -327,8 +327,17 @@ div#dock {
overflow: hidden;
width: 0;
height: 40px;
border-left: 1px solid #e5e5e5;
border-right: 1px solid #fff;
border-left: 1px solid @navbarBackground;
border-right: 1px solid @navbarBackgroundHighlight;
}
}
.navbar-inverse {
.nav {
.divider {
border-left-color: @navbarInverseBackground;
border-right-color: lighten(@navbarInverseBackground, 25%);
}
}
}
......@@ -336,8 +345,8 @@ div#dock {
.divider {
width: auto;
height: 1px;
border-left: 0px none;
border-right: 0px none;
border-left: 0 none;
border-right: 0 none;
}
}
......
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment