rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-01-17 09:52:29 +01:00
Code Issues Actions Packages Releases Activity

Merge pull request #18816 from twbs/fix-17308

Browse Source 
Switch to actually-Safari-specific CSS hack for iOS temporal input fix
This commit is contained in:
Chris Rebert 2016-01-10 18:38:26 -08:00
commit cbc71dc229
2 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
scss/.scss-lint.yml
View File

@ -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

34
scss/_forms.scss
View File

@ -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