diff options
| author | Clement Ho <clemmakesapps@gmail.com> | 2018-06-14 17:01:41 +0000 |
|---|---|---|
| committer | Clement Ho <clemmakesapps@gmail.com> | 2018-06-14 17:01:41 +0000 |
| commit | fe00e53d05eac06392c5987902c452b8de5e5f18 (patch) | |
| tree | c97dce14abaa9b5a4efd744194b13185a94ec4aa | |
| parent | aeaf75102e9b8be407e4226e04756be3b8550770 (diff) | |
| parent | 820aaa871ebb74baebdc38b7c083efb1fc755be7 (diff) | |
| download | gitlab-ce-fe00e53d05eac06392c5987902c452b8de5e5f18.tar.gz | |
Merge branch '47646-ui-glitch' into 'master'
Resolve "GFM: Color chips UI glitch"
Closes #47646
See merge request gitlab-org/gitlab-ce!19687
| -rw-r--r-- | app/assets/stylesheets/framework/gfm.scss | 1 | ||||
| -rw-r--r-- | changelogs/unreleased/47646-ui-glitch.yml | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/app/assets/stylesheets/framework/gfm.scss b/app/assets/stylesheets/framework/gfm.scss index e378e84ca1b..1cf12b1a015 100644 --- a/app/assets/stylesheets/framework/gfm.scss +++ b/app/assets/stylesheets/framework/gfm.scss @@ -19,6 +19,7 @@ .gfm-color_chip { display: inline-block; + line-height: 1; margin: 0 0 2px 4px; vertical-align: middle; border-radius: 3px; diff --git a/changelogs/unreleased/47646-ui-glitch.yml b/changelogs/unreleased/47646-ui-glitch.yml new file mode 100644 index 00000000000..384df4e2cc9 --- /dev/null +++ b/changelogs/unreleased/47646-ui-glitch.yml @@ -0,0 +1,5 @@ +--- +title: Line height fixed +merge_request: +author: Murat Dogan +type: fixed |