Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/twbs/bootstrap-rubygem.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGleb Mazovetskiy <glex.spb@gmail.com>2016-01-19 11:50:08 +0300
committerGleb Mazovetskiy <glex.spb@gmail.com>2016-01-19 11:50:08 +0300
commit2642b162208bacefa24e6d52a576546392289f46 (patch)
treeb65ee830976596974e99ba39239c39a1a4f644ab /assets/stylesheets/bootstrap/_forms.scss
parentb6f12ed698f3a57db519eb7e171b181100b0541a (diff)
rake update[v4-dev]
Diffstat (limited to 'assets/stylesheets/bootstrap/_forms.scss')
-rw-r--r--assets/stylesheets/bootstrap/_forms.scss40
1 files changed, 20 insertions, 20 deletions
diff --git a/assets/stylesheets/bootstrap/_forms.scss b/assets/stylesheets/bootstrap/_forms.scss
index 20a70b3..6de81fc 100644
--- a/assets/stylesheets/bootstrap/_forms.scss
+++ b/assets/stylesheets/bootstrap/_forms.scss
@@ -90,28 +90,30 @@
// set a pixel line-height that matches the given height of the input, but only
// for Safari. See https://bugs.webkit.org/show_bug.cgi?id=139848
//
-// Note that as of 8.3, iOS doesn't support `datetime` or `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;
- }
+// Note that as of 8.3, iOS doesn't support `week`.
+
+// 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
@@ -184,7 +186,6 @@
label {
padding-left: 1.25rem;
margin-bottom: 0;
- font-weight: normal;
cursor: pointer;
// When there's no labels, don't position the input.
@@ -216,7 +217,6 @@
display: inline-block;
padding-left: 1.25rem;
margin-bottom: 0;
- font-weight: normal;
vertical-align: middle;
cursor: pointer;
}