diff options
author | Clement Ho <clemmakesapps@gmail.com> | 2018-06-14 17:01:41 +0000 |
---|---|---|
committer | Filipa Lacerda <filipa@gitlab.com> | 2018-06-15 09:42:21 +0100 |
commit | 2db51fce8d3df9b137c75be8673b01eb1257c093 (patch) | |
tree | a3d6f0ab84204f73f26447a4fa3c055a36fa351c | |
parent | eee1c22499f8eaa899d2921a49553b14fe5b0e26 (diff) | |
download | gitlab-ce-2db51fce8d3df9b137c75be8673b01eb1257c093.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 |