diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2019-05-24 13:10:17 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2019-05-24 13:10:17 +0000 |
| commit | 52758b929fa71540f97cd241d1668ade795306a1 (patch) | |
| tree | a9ad7586e51aa50f806e3562632a4c0728630985 | |
| parent | c509b35b489ff69121c4760faa52d81e7666e9ca (diff) | |
| parent | 360646ead37a59397eb1d4a174cd43f3edd111c6 (diff) | |
| download | gitlab-ce-52758b929fa71540f97cd241d1668ade795306a1.tar.gz | |
Merge branch '60778-input-text-height' into 'master'
Fix height of input groups
Closes #61304, #61303, #59254, and #60778
See merge request gitlab-org/gitlab-ce!28495
| -rw-r--r-- | app/assets/stylesheets/framework/forms.scss | 4 | ||||
| -rw-r--r-- | app/assets/stylesheets/framework/variables_overrides.scss | 1 | ||||
| -rw-r--r-- | changelogs/unreleased/60778-input-text-height.yml | 5 |
3 files changed, 10 insertions, 0 deletions
diff --git a/app/assets/stylesheets/framework/forms.scss b/app/assets/stylesheets/framework/forms.scss index d0f99c2df7e..4a9c73a1bc9 100644 --- a/app/assets/stylesheets/framework/forms.scss +++ b/app/assets/stylesheets/framework/forms.scss @@ -280,3 +280,7 @@ label { max-width: $input-lg-width; width: 100%; } + +.input-group-text { + max-height: $input-height; +} diff --git a/app/assets/stylesheets/framework/variables_overrides.scss b/app/assets/stylesheets/framework/variables_overrides.scss index fb4d3f23cd9..ea96381a098 100644 --- a/app/assets/stylesheets/framework/variables_overrides.scss +++ b/app/assets/stylesheets/framework/variables_overrides.scss @@ -7,6 +7,7 @@ $secondary: $gray-light; $input-disabled-bg: $gray-light; $input-border-color: $gray-200; $input-color: $gl-text-color; +$input-font-size: $gl-font-size; $font-family-sans-serif: $regular-font; $font-family-monospace: $monospace-font; $btn-line-height: 20px; diff --git a/changelogs/unreleased/60778-input-text-height.yml b/changelogs/unreleased/60778-input-text-height.yml new file mode 100644 index 00000000000..c956ead5db2 --- /dev/null +++ b/changelogs/unreleased/60778-input-text-height.yml @@ -0,0 +1,5 @@ +--- +title: Fix input group height +merge_request: +author: +type: other |