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

Conflicts: theme/bootstrapbase/style/moodle.css
2015-07-01 08:57:15 +08:00
parent 7b15a36320 5856c76917
commit c556c5fca5
2 changed files with 14 additions and 5 deletions
@@ -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;
    }
 }