From 331b8d2250f4b1ba29c0833e2be770c3f743ffe5 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 18 Jun 2015 16:01:52 -0700 Subject: Add 21x9 responsive embed modifier - Credit: @adammacias - Fixes #16499 --- scss/_responsive-embed.scss | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'scss') diff --git a/scss/_responsive-embed.scss b/scss/_responsive-embed.scss index c1ef6cb4b..bedab270a 100644 --- a/scss/_responsive-embed.scss +++ b/scss/_responsive-embed.scss @@ -26,6 +26,11 @@ } } +// Modifier class for 21:9 aspect ratio +.embed-responsive-21by9 { + padding-bottom: 42.85%; +} + // Modifier class for 16:9 aspect ratio .embed-responsive-16by9 { padding-bottom: 56.25%; -- cgit v1.2.3 From df2ca92d7704d54a15be54e5da8086712bd18680 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 18 Jun 2015 16:03:48 -0700 Subject: Use percentages in responsive embed modifiers - Credit: @adammacias - Originally proposed in #16499 with previous commit --- scss/_responsive-embed.scss | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'scss') diff --git a/scss/_responsive-embed.scss b/scss/_responsive-embed.scss index bedab270a..772b853c7 100644 --- a/scss/_responsive-embed.scss +++ b/scss/_responsive-embed.scss @@ -28,15 +28,15 @@ // Modifier class for 21:9 aspect ratio .embed-responsive-21by9 { - padding-bottom: 42.85%; + padding-bottom: percentage(9 / 21); } // Modifier class for 16:9 aspect ratio .embed-responsive-16by9 { - padding-bottom: 56.25%; + padding-bottom: percentage(9 / 16); } // Modifier class for 4:3 aspect ratio .embed-responsive-4by3 { - padding-bottom: 75%; + padding-bottom: percentage(3 / 4); } -- cgit v1.2.3 From ecc7d9ba2668967141c8b9af4c6c95b38810c3b5 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 19 Jun 2015 00:00:21 -0700 Subject: fix placement of mixin --- scss/mixins/_reset-text.scss | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 scss/mixins/_reset-text.scss (limited to 'scss') diff --git a/scss/mixins/_reset-text.scss b/scss/mixins/_reset-text.scss new file mode 100644 index 000000000..c78db0314 --- /dev/null +++ b/scss/mixins/_reset-text.scss @@ -0,0 +1,18 @@ +@mixin reset-text { + font-family: $font-family-base; + // We deliberately do NOT reset font-size. + font-style: normal; + font-weight: normal; + letter-spacing: normal; + line-break: auto; + line-height: $line-height-base; + text-align: left; // Fallback for where `start` is not supported + text-align: start; + text-decoration: none; + text-shadow: none; + text-transform: none; + white-space: normal; + word-break: normal; + word-spacing: normal; + word-wrap: normal; +} -- cgit v1.2.3 From e4d72c914dee951c6a3cd47c018882528516d801 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 19 Jun 2015 00:01:57 -0700 Subject: fix vars, grunt that shit --- scss/_variables.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'scss') diff --git a/scss/_variables.scss b/scss/_variables.scss index 103599f68..5b8b1c55e 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -171,8 +171,8 @@ $btn-link-disabled-color: $gray-light !default; // Allows for customizing button radius independently from global border radius $btn-border-radius-base: $border-radius-base; -$btn-border-radius-large: $border-radius-large; -$btn-border-radius-small: $border-radius-small; +$btn-border-radius-lg: $border-radius-lg; +$btn-border-radius-sm: $border-radius-sm; // Forms -- cgit v1.2.3 From 930ed8df32470bcf98c890bc164285d077fbd4e5 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 19 Jun 2015 00:05:40 -0700 Subject: nuke unused .csslintrc --- scss/.csslintrc | 20 -------------------- 1 file changed, 20 deletions(-) delete mode 100644 scss/.csslintrc (limited to 'scss') diff --git a/scss/.csslintrc b/scss/.csslintrc deleted file mode 100644 index 19ceb82e9..000000000 --- a/scss/.csslintrc +++ /dev/null @@ -1,20 +0,0 @@ -{ - "adjoining-classes": false, - "box-sizing": false, - "box-model": false, - "compatible-vendor-prefixes": false, - "fallback-colors": false, - "floats": false, - "font-sizes": false, - "gradients": false, - "important": false, - "known-properties": false, - "outline-none": false, - "qualified-headings": false, - "regex-selectors": false, - "shorthand": false, - "text-indent": false, - "unique-headings": false, - "universal-selector": false, - "unqualified-attributes": false -} -- cgit v1.2.3 From eaa67a82d3a5b63e959feb153a79a82c1aeefbf2 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 19 Jun 2015 00:14:36 -0700 Subject: fix scss linting --- scss/_badge.scss | 4 ++-- scss/_card.scss | 2 +- scss/_carousel.scss | 1 - scss/_forms.scss | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-) (limited to 'scss') diff --git a/scss/_badge.scss b/scss/_badge.scss index 5646da722..e842cea30 100644 --- a/scss/_badge.scss +++ b/scss/_badge.scss @@ -11,11 +11,11 @@ padding-left: .6em; font-size: .75em; font-weight: $badge-font-weight; - color: $badge-color; line-height: $line-height-base; + color: $badge-color; text-align: center; - vertical-align: middle; white-space: nowrap; + vertical-align: middle; background-color: $badge-bg; @include border-radius($badge-border-radius); diff --git a/scss/_card.scss b/scss/_card.scss index 8809ec5c5..b0bac74e1 100644 --- a/scss/_card.scss +++ b/scss/_card.scss @@ -198,8 +198,8 @@ $card-cap-bg: #f5f5f5; .card { flex: 1 0 0; - margin-left: .625rem; margin-right: .625rem; + margin-left: .625rem; } } } @else { diff --git a/scss/_carousel.scss b/scss/_carousel.scss index 39a779f85..8eb4cdd26 100644 --- a/scss/_carousel.scss +++ b/scss/_carousel.scss @@ -128,7 +128,6 @@ .icon-next { position: absolute; top: 50%; - margin-top: -10px; z-index: 5; display: inline-block; width: 20px; diff --git a/scss/_forms.scss b/scss/_forms.scss index e3959d7d4..7cdf54125 100644 --- a/scss/_forms.scss +++ b/scss/_forms.scss @@ -35,8 +35,8 @@ // Unstyle the caret on `