diff options
author | Clement Ho <ClemMakesApps@gmail.com> | 2018-05-23 14:45:32 -0500 |
---|---|---|
committer | Clement Ho <ClemMakesApps@gmail.com> | 2018-05-23 14:45:32 -0500 |
commit | 51d455d05bfbdba5fac62c799703bd50fe7d70e4 (patch) | |
tree | a886df6d419378607d4fdf10112f79914613ed32 /app/assets/stylesheets/framework/variables.scss | |
parent | ee16cf15baca0405b0db2db029c0538d8496864f (diff) | |
parent | 6c51e220ef2774447038a909c4f22ff90eb624fb (diff) | |
download | gitlab-ce-51d455d05bfbdba5fac62c799703bd50fe7d70e4.tar.gz |
Merge branch 'master' into bootstrap4
Diffstat (limited to 'app/assets/stylesheets/framework/variables.scss')
-rw-r--r-- | app/assets/stylesheets/framework/variables.scss | 4 |
1 files changed, 2 insertions, 2 deletions
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 |