MDL-40321 theme_bootstrapbase: Combine reset into existing overrides file

theme/bootstrapbase/less/moodle.less

@@ -33,9 +33,6 @@
 // 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.

theme/bootstrapbase/less/moodle/bootstrapoverride.less

@@ -5,7 +5,7 @@
  * rules defined in Bootstrap.
 */
 
-/** Headings **/
+// Headings.
 h1 { font-size: round(@baseFontSize * 2.30); } // ~32px
 h2 { font-size: round(@baseFontSize * 2.00); } // ~28px
 h3 { font-size: round(@baseFontSize * 1.70); } // ~24px
@@ -17,3 +17,10 @@ h1 small { font-size: round(@baseFontSize * 1.70); } // ~24px
 h2 small { font-size: round(@baseFontSize * 1.40); } // ~20px
 h3 small { font-size: round(@baseFontSize * 1.15); } // ~16px
 h4 small { font-size: round(@baseFontSize * 0.85); } // ~12px
+
+// Printing.
+@media print {
+  a[href]:after {
+    content: "";
+  }
+}

theme/bootstrapbase/less/moodle/reset.less

@@ -1,8 +0,0 @@
-// Printing
-// -------------------------
-
-@media print {
-  a[href]:after {
-    content: "";
-  }
-}