4 files changed, 76 insertions, 1 deletions
diff --git a/scss/_normalize.scss b/scss/_normalize.scss
index ef23245cb..2e62b53ec 100644
--- a/scss/_normalize.scss
+++ b/scss/_normalize.scss
@@ -99,7 +99,7 @@ a {
   &:active {
     outline: 0;
   }
-  @include hover {
+  &:hover {
     outline: 0;
   }
 }
diff --git a/scss/bootstrap-flex.scss b/scss/bootstrap-flex.scss
new file mode 100644
index 000000000..60dd03a68
--- /dev/null
+++ b/scss/bootstrap-flex.scss
@@ -0,0 +1,8 @@
+// Bootstrap with Flexbox enabled
+//
+// Includes all the imports from the standard Bootstrap project, but enables
+// the flexbox variable.
+
+$enable-flex: true;
+
+@import "bootstrap";
diff --git a/scss/bootstrap-grid.scss b/scss/bootstrap-grid.scss
new file mode 100644
index 000000000..7308f83b7
--- /dev/null
+++ b/scss/bootstrap-grid.scss
@@ -0,0 +1,57 @@
+// Bootstrap Grid only
+//
+// Includes relevant variables and mixins for the regular (non-flexbox) grid
+// system, as well as the generated predefined classes (e.g., `.col-4-sm`).
+
+
+//
+// Variables
+//
+
+// Grid system
+//
+// Define your custom responsive grid.
+$grid-breakpoints: (
+  // Extra small screen / phone
+  xs: 0,
+  // Small screen / phone
+  sm: 34em,
+  // Medium screen / tablet
+  md: 48em,
+  // Large screen / desktop
+  lg: 62em,
+  // Extra large screen / wide desktop
+  xl: 75em
+) !default;
+
+// Number of columns in the grid.
+$grid-columns:               12 !default;
+
+// Padding between columns. Gets divided in half for the left and right.
+$grid-gutter-width:          1.5rem !default;
+
+
+// Container sizes
+//
+// Define the maximum width of `.container` for different screen sizes.
+
+$container-max-widths: (
+  sm: 34rem,    // 480
+  md: 45rem,    // 720
+  lg: 60rem,    // 960
+  xl: 72.25rem  // 1140
+) !default;
+
+
+//
+// Grid mixins
+//
+
+@import "variables";
+
+@import "mixins/clearfix";
+@import "mixins/breakpoints";
+@import "mixins/grid-framework";
+@import "mixins/grid";
+
+@import "grid";
diff --git a/scss/bootstrap-reboot.scss b/scss/bootstrap-reboot.scss
new file mode 100644
index 000000000..f7ff43eb2
--- /dev/null
+++ b/scss/bootstrap-reboot.scss
@@ -0,0 +1,10 @@
+// Bootstrap Reboot only
+//
+// Includes only Normalize and our custom Reboot reset.
+
+@import "variables";
+@import "mixins/hover";
+@import "mixins/tab-focus";
+
+@import "normalize";
+@import "reboot";