Add latest changes from gitlab-org/gitlab@13-2-stable-ee

1 files changed, 10 insertions, 9 deletions

diff --git a/app/assets/stylesheets/bootstrap_migration.scss b/app/assets/stylesheets/bootstrap_migration.scss
index a6d56819140..aac32e7fb2d 100644
--- a/app/assets/stylesheets/bootstrap_migration.scss
+++ b/app/assets/stylesheets/bootstrap_migration.scss
@@ -6,7 +6,7 @@ $brand-info: $blue-500;
 $brand-warning: $orange-500;
 $brand-danger: $red-500;
 
-$border-radius-base: 3px !default;
+$border-radius-base: $gl-border-radius-base;
 
 $modal-body-bg: $white;
 $input-border: $border-color;
@@ -23,7 +23,7 @@ body,
   // Override default font size used in non-csslab UI
   // Use rem to keep default font-size at 14px on body so 1rem still
   // fits 8px grid, but also allow users to change browser font size
-  font-size: .875rem;
+  font-size: 0.875rem;
 }
 
 legend {
@@ -32,11 +32,12 @@ legend {
 }
 
 button,
-html [type="button"],
-[type="reset"],
-[type="submit"],
-[role="button"] {
+html [type='button'],
+[type='reset'],
+[type='submit'],
+[role='button'] {
   // Override bootstrap reboot
+  /* stylelint-disable-next-line property-no-vendor-prefix */
   -webkit-appearance: inherit;
   cursor: pointer;
 }
@@ -77,7 +78,7 @@ h5,
   font-size: $gl-font-size;
 }
 
-input[type="file"] {
+input[type='file'] {
   // Bootstrap 4 file input height is taller by default
   // which makes them look ugly
   line-height: 1;
@@ -314,8 +315,8 @@ input[type=color].form-control {
 
 .toggle-sidebar-button {
   .collapse-text,
-  .icon-angle-double-left,
-  .icon-angle-double-right {
+  .icon-chevron-double-lg-left,
+  .icon-chevron-double-lg-right {
     color: $gl-text-color-secondary;
   }
 }