diff options
| author | Paul Slaughter <pslaughter@gitlab.com> | 2018-12-12 13:46:54 -0600 |
|---|---|---|
| committer | Paul Slaughter <pslaughter@gitlab.com> | 2018-12-12 13:46:54 -0600 |
| commit | 9c001c0d8b8948e120184a6c804783c15558a48d (patch) | |
| tree | fc991083978f534619b7f1fb07e7a87bbe3d3810 | |
| parent | a9be222fa98733f07f6e2390401e01c7521a2d2d (diff) | |
| download | gitlab-ce-9c001c0d8b8948e120184a6c804783c15558a48d.tar.gz | |
Fix small button line height
**Why?**
Commit 75496059 accidentally changed line height for all small buttons.
This fixes that by introducing some `btn-xs` variables.
| -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 5310195d9c5..5771133bfe1 100644 --- a/app/assets/stylesheets/framework/variables.scss +++ b/app/assets/stylesheets/framework/variables.scss @@ -369,7 +369,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 |