diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2018-12-13 16:00:41 +0300 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2018-12-13 16:00:41 +0300 |
| commit | c7ac2c715abf45846748b056239d2e6586ce29f7 (patch) | |
| tree | f9c8ae79675e05d9db160d4fd6f65dc362c0574a /app/assets | |
| parent | 2b5b4d922a55f134e0d21a11ff5319d2d3d6f49e (diff) | |
| parent | 9c001c0d8b8948e120184a6c804783c15558a48d (diff) | |
Merge branch '55257-fix-sm-button-sizes' into 'master'
Fix small button line height
Closes #55257
See merge request gitlab-org/gitlab-ce!23779
Diffstat (limited to 'app/assets')
| -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 0fc8cc10b7c..a92481b3ebb 100644 --- a/app/assets/stylesheets/framework/variables.scss +++ b/app/assets/stylesheets/framework/variables.scss @@ -371,7 +371,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 |