diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2018-12-13 13:00:41 +0000 |
|---|---|---|
| committer | GitLab Release Tools Bot <robert+release-tools@gitlab.com> | 2018-12-14 12:04:50 +0000 |
| commit | 552bb530c0b35d2982903aa38c382afd38d0525b (patch) | |
| tree | 130158c7c151dd1ceefc0462e7b2601a00c344d1 | |
| parent | 946fea7416b930e41894f4533f71b607f99a7092 (diff) | |
| download | gitlab-ce-552bb530c0b35d2982903aa38c382afd38d0525b.tar.gz | |
Merge branch '55257-fix-sm-button-sizes' into 'master'
Fix small button line height
Closes #55257
See merge request gitlab-org/gitlab-ce!23779
(cherry picked from commit c7ac2c715abf45846748b056239d2e6586ce29f7)
9c001c0d Fix small button line height
| -rw-r--r-- | app/assets/stylesheets/framework/buttons.scss | 4 | ||||
| -rw-r--r-- | app/assets/stylesheets/framework/variables.scss | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/app/assets/stylesheets/framework/buttons.scss b/app/assets/stylesheets/framework/buttons.scss index e36f99ac577..a4a9276c580 100644 --- a/app/assets/stylesheets/framework/buttons.scss +++ b/app/assets/stylesheets/framework/buttons.scss @@ -148,8 +148,8 @@ &.btn-xs { padding: 2px $gl-btn-padding; - font-size: $gl-btn-small-font-size; - line-height: $gl-btn-small-line-height; + font-size: $gl-btn-xs-font-size; + line-height: $gl-btn-xs-line-height; } &.btn-success, diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss index 134b3a4521b..db9461cb001 100644 --- a/app/assets/stylesheets/framework/variables.scss +++ b/app/assets/stylesheets/framework/variables.scss @@ -368,7 +368,9 @@ $gl-btn-line-height: 16px; $gl-btn-vert-padding: 8px; $gl-btn-horz-padding: 12px; $gl-btn-small-font-size: 13px; -$gl-btn-small-line-height: 13px; +$gl-btn-small-line-height: 18px; +$gl-btn-xs-font-size: 13px; +$gl-btn-xs-line-height: 13px; /* * Badges |