Merge branch 'master' into bootstrap4

5 files changed, 10 insertions, 30 deletions

diff --git a/app/assets/stylesheets/framework/forms.scss b/app/assets/stylesheets/framework/forms.scss
index afd7ee02dae..e742c0b74db 100644
--- a/app/assets/stylesheets/framework/forms.scss
+++ b/app/assets/stylesheets/framework/forms.scss
@@ -121,6 +121,14 @@ label {
   @include box-shadow(none);
   border-radius: 2px;
   padding: $gl-vert-padding $gl-input-padding;
+
+  &.input-short {
+    width: $input-short-width;
+
+    @media (min-width: $screen-md-min) {
+      width: $input-short-md-width;
+    }
+  }
 }
 
 .select-wrapper {
diff --git a/app/assets/stylesheets/framework/secondary_navigation_elements.scss b/app/assets/stylesheets/framework/secondary_navigation_elements.scss
index 75667da5fd8..c33d808a01f 100644
--- a/app/assets/stylesheets/framework/secondary_navigation_elements.scss
+++ b/app/assets/stylesheets/framework/secondary_navigation_elements.scss
@@ -128,14 +128,6 @@
 
       /* Large devices (large desktops, 1200px and up) */
       @include media-breakpoint-up(lg) { width: 250px; }
-
-      &.input-short {
-        /* Medium devices (desktops, 992px and up) */
-        @include media-breakpoint-up(md) { width: 170px; }
-
-        /* Large devices (large desktops, 1200px and up) */
-        @include media-breakpoint-up(lg) { width: 210px; }
-      }
     }
 
     @include media-breakpoint-down(xs) {
@@ -164,10 +156,6 @@
         }
       }
 
-      .input-short {
-        width: 100%;
-      }
-
       .icon-label {
         display: inline-block;
       }
diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss
index bea2268d82c..dd0aac99ff3 100644
--- a/app/assets/stylesheets/framework/variables.scss
+++ b/app/assets/stylesheets/framework/variables.scss
@@ -559,8 +559,8 @@ $input-danger-border: $red-400;
 $input-group-addon-bg: #f7f8fa;
 $gl-field-focus-shadow: rgba(0, 0, 0, 0.075);
 $gl-field-focus-shadow-error: rgba($red-500, 0.6);
-$input-disabled-bg: $gray-lighter;
-$input-border-color: $border-color;
+$input-short-width: 200px;
+$input-short-md-width: 280px;
 
 /*
 * Help
diff --git a/app/assets/stylesheets/pages/members.scss b/app/assets/stylesheets/pages/members.scss
index a9fda313d72..592d04dd1af 100644
--- a/app/assets/stylesheets/pages/members.scss
+++ b/app/assets/stylesheets/pages/members.scss
@@ -99,16 +99,6 @@
     @include media-breakpoint-up(sm) {
       width: 250px;
     }
-
-    &.input-short {
-      @include media-breakpoint-up(md) {
-        width: 170px;
-      }
-
-      @include media-breakpoint-up(lg) {
-        width: 210px;
-      }
-    }
   }
 }
 
diff --git a/app/assets/stylesheets/pages/projects.scss b/app/assets/stylesheets/pages/projects.scss
index 4d894e24232..3976812dfdb 100644
--- a/app/assets/stylesheets/pages/projects.scss
+++ b/app/assets/stylesheets/pages/projects.scss
@@ -873,12 +873,6 @@ pre.light-well {
   margin: 0;
 }
 
-.commits-search-form {
-  .input-short {
-    min-width: 200px;
-  }
-}
-
 .git-clone-holder {
   width: 380px;