From: Chris Rebert Date: Sat, 9 Jan 2016 07:59:16 +0000 (-0800) Subject: Switch to actually-Safari-specific CSS hack when fixing vertical alignment of tempora... X-Git-Tag: v4.0.0-alpha.3~381^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=350ce2f707d38f5b87364e858177f4bd3cc13d27;p=thirdparty%2Fbootstrap.git Switch to actually-Safari-specific CSS hack when fixing vertical alignment of temporal input text in iOS Safari See http://browserbu.gs/css-hacks/webkit-full-page-media/ Fixes #17308 [skip sauce] [skip validator] --- diff --git a/scss/.scss-lint.yml b/scss/.scss-lint.yml index 06c6207d10..b736c3699d 100644 --- a/scss/.scss-lint.yml +++ b/scss/.scss-lint.yml @@ -396,6 +396,7 @@ linters: SelectorFormat: enabled: true convention: hyphenated_lowercase # or 'BEM', or 'snake_case', or 'camel_case', or a regex pattern + ignored_types: ["element"] Shorthand: enabled: true diff --git a/scss/_forms.scss b/scss/_forms.scss index 0d5e364ec6..6de81fcf8b 100644 --- a/scss/_forms.scss +++ b/scss/_forms.scss @@ -92,26 +92,28 @@ // // Note that as of 8.3, iOS doesn't support `week`. -@media screen and (-webkit-min-device-pixel-ratio: 0) { - input[type="date"], - input[type="time"], - input[type="datetime-local"], - input[type="month"] { - &.form-control { - line-height: $input-height; - } +// SCSS-Lint exemption until https://github.com/brigade/scss-lint/pull/672 gets merged +// scss-lint:disable PseudoElement +_::-webkit-full-page-media, // Hack to make this CSS be Safari-only; see http://browserbu.gs/css-hacks/webkit-full-page-media/ +input[type="date"], +input[type="time"], +input[type="datetime-local"], +input[type="month"] { + &.form-control { + line-height: $input-height; + } - &.input-sm, - .input-group-sm &.form-control { - line-height: $input-height-sm; - } + &.input-sm, + .input-group-sm &.form-control { + line-height: $input-height-sm; + } - &.input-lg, - .input-group-lg &.form-control { - line-height: $input-height-lg; - } + &.input-lg, + .input-group-lg &.form-control { + line-height: $input-height-lg; } } +// scss-lint:enable PseudoElement // Static form control text