diff options
| author | David Baughman <[email protected]> | 2015-08-27 13:41:24 -0700 |
|---|---|---|
| committer | David Baughman <[email protected]> | 2015-08-27 13:41:24 -0700 |
| commit | e481c8fff268a1cce1fe0d60dc85d4f6b85e855e (patch) | |
| tree | 361d07f1cbe685332826d6cb6b291243a939df30 /scss | |
| parent | 026682bf0dc828d8d689cb01e623eb311de0c013 (diff) | |
| parent | 232469549c9a9b6082b311f568556d99ea03af2f (diff) | |
| download | bootstrap-e481c8fff268a1cce1fe0d60dc85d4f6b85e855e.tar.xz bootstrap-e481c8fff268a1cce1fe0d60dc85d4f6b85e855e.zip | |
Merge branch 'v4-dev' into v4-media-breakpoint-between
Diffstat (limited to 'scss')
| -rw-r--r-- | scss/_forms.scss | 2 | ||||
| -rw-r--r-- | scss/_mixins.scss | 1 | ||||
| -rw-r--r-- | scss/_utilities-responsive.scss | 2 | ||||
| -rw-r--r-- | scss/mixins/_responsive-visibility.scss | 21 |
4 files changed, 2 insertions, 24 deletions
diff --git a/scss/_forms.scss b/scss/_forms.scss index 72ec9b03f..f8ffed37e 100644 --- a/scss/_forms.scss +++ b/scss/_forms.scss @@ -384,7 +384,7 @@ input[type="checkbox"] { // Requires wrapping inputs and labels with `.form-group` for proper display of // default HTML form controls and our custom form controls (e.g., input groups). // -// Heads up! This is mixin-ed into `.navbar-form` in navbars.less. +// Heads up! This is mixin-ed into `.navbar-form` in _navbar.scss. .form-inline { diff --git a/scss/_mixins.scss b/scss/_mixins.scss index 35f46feb7..4caee21fb 100644 --- a/scss/_mixins.scss +++ b/scss/_mixins.scss @@ -28,7 +28,6 @@ @import "mixins/label"; @import "mixins/reset-filter"; @import "mixins/resize"; -@import "mixins/responsive-visibility"; @import "mixins/screen-reader"; @import "mixins/size"; @import "mixins/tab-focus"; diff --git a/scss/_utilities-responsive.scss b/scss/_utilities-responsive.scss index c69ecc93e..2c3617ce0 100644 --- a/scss/_utilities-responsive.scss +++ b/scss/_utilities-responsive.scss @@ -44,6 +44,6 @@ .hidden-print { @media print { - @include responsive-invisibility(".hidden-print"); + display: none !important; } } diff --git a/scss/mixins/_responsive-visibility.scss b/scss/mixins/_responsive-visibility.scss deleted file mode 100644 index cbdf77723..000000000 --- a/scss/mixins/_responsive-visibility.scss +++ /dev/null @@ -1,21 +0,0 @@ -// Responsive utilities - -// -// More easily include all the states for responsive-utilities.less. -// [converter] $parent hack -@mixin responsive-visibility($parent) { - #{$parent} { - display: block !important; - } - table#{$parent} { display: table !important; } - tr#{$parent} { display: table-row !important; } - th#{$parent}, - td#{$parent} { display: table-cell !important; } -} - -// [converter] $parent hack -@mixin responsive-invisibility($parent) { - #{$parent} { - display: none !important; - } -} |