From: Mark Otto <markd.otto@gmail.com>
Date: Sun, 22 Oct 2017 21:26:49 +0000 (-0700)
Subject: Merge branch 'v4-dev' into btn_input_split_variables
X-Git-Tag: v4.0.0-beta.3~176^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1f42d79561d3931b91e09e5d1d04b3a4ce9aa431;p=thirdparty%2Fbootstrap.git

Merge branch 'v4-dev' into btn_input_split_variables
---

1f42d79561d3931b91e09e5d1d04b3a4ce9aa431
diff --cc scss/_forms.scss
index 5ac3f88a2f,42f2399e87..d2a1b3601d
--- a/scss/_forms.scss
+++ b/scss/_forms.scss
@@@ -7,15 -7,13 +7,13 @@@
  .form-control {
    display: block;
    width: 100%;
 -  padding: $input-btn-padding-y $input-btn-padding-x;
 +  padding: $input-padding-y $input-padding-x;
    font-size: $font-size-base;
 -  line-height: $input-btn-line-height;
 +  line-height: $input-line-height;
    color: $input-color;
    background-color: $input-bg;
-   // Reset unusual Firefox-on-Android default style; see https://github.com/necolas/normalize.css/issues/214.
-   background-image: none;
    background-clip: padding-box;
 -  border: $input-btn-border-width solid $input-border-color;
 +  border: $input-border-width solid $input-border-color;
  
    // Note: This has no effect on <select>s in some browsers, due to the limited stylability of `<select>`s in CSS.
    @if $enable-rounded {
@@@ -129,13 -127,15 +127,15 @@@ select.form-control 
  // text (without any border, background color, focus indicator)
  
  .form-control-plaintext {
+   display: block;
+   width: 100%;
 -  padding-top: $input-btn-padding-y;
 -  padding-bottom: $input-btn-padding-y;
 +  padding-top: $input-padding-y;
 +  padding-bottom: $input-padding-y;
    margin-bottom: 0; // match inputs if this class comes on inputs with default margins
 -  line-height: $input-btn-line-height;
 +  line-height: $input-line-height;
    background-color: transparent;
    border: solid transparent;
 -  border-width: $input-btn-border-width 0;
 +  border-width: $input-border-width 0;
  
    &.form-control-sm,
    &.form-control-lg {
diff --cc scss/_input-group.scss
index f5eed46f9f,ae70ebc081..771fd6ec86
--- a/scss/_input-group.scss
+++ b/scss/_input-group.scss
@@@ -168,8 -168,8 +168,8 @@@
    &:not(:first-child) {
      > .btn,
      > .btn-group {
-       z-index: 2;
+       z-index: 1;
 -      // remove nagative margin ($input-btn-border-width) to solve overlapping issue with button.
 +      // remove nagative margin ($input-border-width) to solve overlapping issue with button.
        margin-left: 0;
  
        // When input is first, overlap the right side of it with the button(-group)
diff --cc scss/_variables.scss
index f141994df5,50972c53b9..2ea031c157
--- a/scss/_variables.scss
+++ b/scss/_variables.scss
@@@ -320,31 -330,9 +328,30 @@@ $input-btn-padding-y-lg:      .5rem !de
  $input-btn-padding-x-lg:      1rem !default;
  $input-btn-line-height-lg:    $line-height-lg !default;
  
 +$input-btn-border-width:      $border-width !default; // For form controls and buttons
 +
 +
 +// Buttons
 +//
 +// For each of Bootstrap's buttons, define text, background and border color.
 +
 +$btn-padding-y:               $input-btn-padding-y !default;
 +$btn-padding-x:               $input-btn-padding-x !default;
 +$btn-line-height:             $input-btn-line-height !default;
 +
 +$btn-padding-y-sm:            $input-btn-padding-y-sm !default;
 +$btn-padding-x-sm:            $input-btn-padding-x-sm !default;
 +$btn-line-height-sm:          $input-btn-line-height-sm !default;
 +
 +$btn-padding-y-lg:            $input-btn-padding-y-lg !default;
 +$btn-padding-x-lg:            $input-btn-padding-x-lg !default;
 +$btn-line-height-lg:          $input-btn-line-height-lg !default;
 +
 +$btn-border-width:            $input-btn-border-width !default;
 +
  $btn-font-weight:             $font-weight-normal !default;
- $btn-box-shadow:              inset 0 1px 0 rgba($white,.15), 0 1px 1px rgba($black,.075) !default;
- $btn-focus-box-shadow:        0 0 0 3px rgba(theme-color("primary"), .25) !default;
- $btn-active-box-shadow:       inset 0 3px 5px rgba($black,.125) !default;
+ $btn-box-shadow:              inset 0 1px 0 rgba($white, .15), 0 1px 1px rgba($black, .075) !default;
+ $btn-active-box-shadow:       inset 0 3px 5px rgba($black, .125) !default;
  
  $btn-link-disabled-color:     $gray-600 !default;