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

Conflicts: theme/bootstrapbase/less/moodle/responsive.less theme/bootstrapbase/style/moodle.css
dmiletic · Sep 23, 2014 · 7fca0ce · 7fca0ce
2 parents b32e177 + 1ee45d6
commit 7fca0ce
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/theme/bootstrapbase/less/moodle/responsive.less b/theme/bootstrapbase/less/moodle/responsive.less
@@ -518,6 +518,16 @@
                         }
                     }
                 }
+                .divider {
+                    width: auto;
+                    display: block;
+                    height: 0px;
+                    margin: 4px 1px;
+                    border-left: 0px none;
+                    border-right: 0px none;
+                    border-top: 1px solid @navbarBorder;
+                    border-bottom: 1px solid @navbarBackgroundHighlight;
+                }
             }
         }
     }

diff --git a/theme/bootstrapbase/style/moodle.css b/theme/bootstrapbase/style/moodle.css