Merge branch 'master' into fix/to-type-null

twbs · Mar 16, 2020 · bea4f64 · bea4f64
2 parents 0c25335 + 52c5b06
commit bea4f64
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 16 deletions.
diff --git a/scss/_reboot.scss b/scss/_reboot.scss
@@ -528,9 +528,18 @@ legend {
 // Fix height of inputs with a type of datetime-local, date, month, week, or time
 // See https://github.com/twbs/bootstrap/issues/18842
 
-::-webkit-datetime-edit {
-  overflow: visible;
-  line-height: 0;
+::-webkit-datetime-edit-fields-wrapper,
+::-webkit-datetime-edit-text,
+::-webkit-datetime-edit-minute,
+::-webkit-datetime-edit-hour-field,
+::-webkit-datetime-edit-day-field,
+::-webkit-datetime-edit-month-field,
+::-webkit-datetime-edit-year-field {
+  padding: 0;
+}
+
+::-webkit-inner-spin-button {
+  height: auto;
 }
 
 // 1. Correct the outline style in Safari.

diff --git a/scss/_utilities.scss b/scss/_utilities.scss
@@ -29,8 +29,8 @@ $utilities: map-merge(
       property: box-shadow,
       class: shadow,
       values: (
-        sm: $box-shadow-sm,
         null: $box-shadow,
+        sm: $box-shadow-sm,
         lg: $box-shadow-lg,
         none: none,
       )

diff --git a/scss/_variables.scss b/scss/_variables.scss
@@ -428,6 +428,7 @@ $blockquote-small-color:      $gray-600 !default;
 $blockquote-small-font-size:  $small-font-size !default;
 $blockquote-font-size:        $font-size-base * 1.25 !default;
 
+$hr-margin-y:                 $spacer !default;
 $hr-color:                    inherit !default;
 $hr-height:                   $border-width !default;
 $hr-opacity:                  .25 !default;
@@ -446,8 +447,6 @@ $list-inline-padding:         .5rem !default;
 
 $mark-bg:                     #fcf8e3 !default;
 
-$hr-margin-y:                 $spacer !default;
-
 
 // Tables
 //
@@ -497,9 +496,10 @@ $input-btn-font-family:       null !default;
 $input-btn-font-size:         $font-size-base !default;
 $input-btn-line-height:       $line-height-base !default;
 
-$input-btn-focus-width:       .2rem !default;
-$input-btn-focus-color:       rgba($component-active-bg, .25) !default;
-$input-btn-focus-box-shadow:  0 0 0 $input-btn-focus-width $input-btn-focus-color !default;
+$input-btn-focus-width:         .2rem !default;
+$input-btn-focus-color-opacity: .25 !default;
+$input-btn-focus-color:         rgba($component-active-bg, $input-btn-focus-color-opacity) !default;
+$input-btn-focus-box-shadow:    0 0 0 $input-btn-focus-width $input-btn-focus-color !default;
 
 $input-btn-padding-y-sm:      .25rem !default;
 $input-btn-padding-x-sm:      .5rem !default;

diff --git a/scss/forms/_form-file.scss b/scss/forms/_form-file.scss
@@ -1,9 +1,6 @@
 .form-file {
   position: relative;
-  display: inline-block;
-  width: 100%;
   height: $form-file-height;
-  margin-bottom: 0;
 }
 
 .form-file-input {

diff --git a/scss/forms/_form-select.scss b/scss/forms/_form-select.scss
@@ -4,7 +4,7 @@
 // https://primer.github.io/.
 
 .form-select {
-  display: inline-block;
+  display: block;
   width: 100%;
   height: $form-select-height;
   padding: $form-select-padding-y ($form-select-padding-x + $form-select-indicator-padding) $form-select-padding-y $form-select-padding-x;

diff --git a/scss/mixins/_forms.scss b/scss/mixins/_forms.scss
@@ -58,7 +58,7 @@
 
       &:focus {
         border-color: $color;
-        box-shadow: 0 0 0 $input-focus-width rgba($color, .25);
+        box-shadow: 0 0 0 $input-focus-width rgba($color, $input-btn-focus-color-opacity);
       }
     }
   }

diff --git a/site/content/docs/4.3/getting-started/rfs.md b/site/content/docs/4.3/getting-started/rfs.md
@@ -66,8 +66,8 @@ In this example, we use one of Bootstrap's built-in [responsive breakpoint mixin
 ```scss
 .selector {
   @include media-breakpoint-down(lg) {
-     padding: rfs-fluid-value(2rem);
-     font-size: rfs-fluid-value(1.125rem);
+    padding: rfs-fluid-value(2rem);
+    font-size: rfs-fluid-value(1.125rem);
   }
 }
 ```