Merge branch 'v4-dev' into v4-navbars

64dcb8b5 · Mark Otto · 15f522fd · 63129112 · 64dcb8b5 · 64dcb8b5
Commit 64dcb8b5 authored 8 years ago by Mark Otto
Expand all Hide whitespace changes
Inline Side-by-side

Showing

with 50 additions and 84 deletions
+50 -84
--- a/scss/_print.scss
+++ b/scss/_print.scss
--- a/scss/_progress.scss
+++ b/scss/_progress.scss
--- a/scss/_reboot.scss
+++ b/scss/_reboot.scss
--- a/scss/_tables.scss
+++ b/scss/_tables.scss
--- a/scss/_variables.scss
+++ b/scss/_variables.scss
--- a/scss/bootstrap-grid.scss
+++ b/scss/bootstrap-grid.scss
--- a/scss/bootstrap.scss
+++ b/scss/bootstrap.scss
--- a/scss/mixins/_forms.scss
+++ b/scss/mixins/_forms.scss
--- a/scss/mixins/_grid-framework.scss
+++ b/scss/mixins/_grid-framework.scss
--- a/scss/mixins/_grid.scss
+++ b/scss/mixins/_grid.scss
--- a/scss/mixins/_text-emphasis.scss
+++ b/scss/mixins/_text-emphasis.scss
--- a/scss/utilities/_background.scss
+++ b/scss/utilities/_background.scss
--- a/scss/utilities/_text.scss
+++ b/scss/utilities/_text.scss
--- a/scss/utilities/_visibility.scss
+++ b/scss/utilities/_visibility.scss