aboutsummaryrefslogtreecommitdiff
path: root/scss
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2015-06-18 10:19:50 -0700
committerMark Otto <[email protected]>2015-06-18 10:19:50 -0700
commit8410afe0e104459a613f6232ad46334aa8b99fda (patch)
tree9fbf0dfa4ab705e676891fbbfb8df8f11bb13e7d /scss
parente615ae053c816fa477d158562e20ecaf2609128d (diff)
downloadbootstrap-8410afe0e104459a613f6232ad46334aa8b99fda.tar.xz
bootstrap-8410afe0e104459a613f6232ad46334aa8b99fda.zip
Create new stylesheets for optional builds and add them to Gruntfile tasks
Diffstat (limited to 'scss')
-rw-r--r--scss/_normalize.scss2
-rw-r--r--scss/bootstrap-flex.scss8
-rw-r--r--scss/bootstrap-grid.scss57
-rw-r--r--scss/bootstrap-reboot.scss10
4 files changed, 76 insertions, 1 deletions
diff --git a/scss/_normalize.scss b/scss/_normalize.scss
index 135fe2a3a..e49b5281c 100644
--- a/scss/_normalize.scss
+++ b/scss/_normalize.scss
@@ -98,7 +98,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..892cda67e
--- /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.scss";
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";