diff options
author | Filipa Lacerda <filipa@gitlab.com> | 2019-05-24 13:10:17 +0000 |
---|---|---|
committer | GitLab Release Tools Bot <robert+release-tools@gitlab.com> | 2019-06-03 13:00:27 +0000 |
commit | 8bcd9a32dc6a4332ad5a5fc72f9d575fd6387627 (patch) | |
tree | 0e336249797fe15581cd866770b8af44b275c739 | |
parent | 87edc80589b15ef7c41098d69c9c4daa9c8d89e1 (diff) | |
download | gitlab-ce-8bcd9a32dc6a4332ad5a5fc72f9d575fd6387627.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
(cherry picked from commit 52758b929fa71540f97cd241d1668ade795306a1)
360646ea Fix height of input groups
-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 1c23c14c2de..66713366587 100644 --- a/app/assets/stylesheets/framework/forms.scss +++ b/app/assets/stylesheets/framework/forms.scss @@ -275,3 +275,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 |