Merge branch 'wip-MDL-40321_master' of git://github.com/gjb2048/moodle

Conflicts: theme/bootstrapbase/style/moodle.css
2013-08-27 10:07:07 +08:00
parent 51eba172e6 44877c48d0
commit 37bb910633
3 changed files with 12 additions and 1 deletions
@@ -33,6 +33,9 @@
 // Roll back nameclashes.
@import "moodle/undo";

+// Roll back resets.
+@import "moodle/reset";
+
 // Extra padding for fixed nav.
 // Needs to be between bootstrap/bootstrap and
 // bootstrap/responsive.
@@ -0,0 +1,8 @@
+// Printing
+// -------------------------
+
+@media print {
+  a[href]:after {
+    content: "";
+  }
+}