aboutsummaryrefslogtreecommitdiff
path: root/scss/_custom-forms.scss
diff options
context:
space:
mode:
authorPierre-Denis Vanduynslager <[email protected]>2017-03-18 22:08:55 -0400
committerPierre-Denis Vanduynslager <[email protected]>2017-03-18 22:08:55 -0400
commitf5cc59145642d78d7abbdf38fee1905786da5367 (patch)
tree94e9454a55f9a55353a0ade4bebb7935d03e7da1 /scss/_custom-forms.scss
parent4ab576a41941b720e2f6fa77724203f66a1d3a17 (diff)
parent192a8af0dfcdb5d64a5f273b804011bdcd5d2436 (diff)
downloadbootstrap-f5cc59145642d78d7abbdf38fee1905786da5367.tar.xz
bootstrap-f5cc59145642d78d7abbdf38fee1905786da5367.zip
Merge branch 'twbs/v4-dev' into dropdown-keyboard
Diffstat (limited to 'scss/_custom-forms.scss')
-rw-r--r--scss/_custom-forms.scss8
1 files changed, 2 insertions, 6 deletions
diff --git a/scss/_custom-forms.scss b/scss/_custom-forms.scss
index 3bc02a239..39f164822 100644
--- a/scss/_custom-forms.scss
+++ b/scss/_custom-forms.scss
@@ -15,7 +15,6 @@
min-height: (1rem * $line-height-base);
padding-left: $custom-control-gutter;
margin-right: $custom-control-spacer-x;
- cursor: pointer;
}
.custom-control-input {
@@ -136,7 +135,7 @@
.custom-select {
display: inline-block;
max-width: 100%;
- $select-border-width: ($border-width * 2);
+ $select-border-width: ($custom-select-border-width * 2);
height: calc(#{$input-height} + #{$select-border-width});
padding: $custom-select-padding-y ($custom-select-padding-x + $custom-select-indicator-padding) $custom-select-padding-y $custom-select-padding-x;
line-height: $custom-select-line-height;
@@ -146,9 +145,7 @@
background-size: $custom-select-bg-size;
border: $custom-select-border-width solid $custom-select-border-color;
@include border-radius($custom-select-border-radius);
- // Use vendor prefixes as `appearance` isn't part of the CSS spec.
- -moz-appearance: none;
- -webkit-appearance: none;
+ appearance: none;
&:focus {
border-color: $custom-select-focus-border-color;
@@ -200,7 +197,6 @@
max-width: 100%;
height: $custom-file-height;
margin-bottom: 0;
- cursor: pointer;
}
.custom-file-input {