diff options
author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-05-26 14:13:18 +0000 |
---|---|---|
committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-05-26 14:13:18 +0000 |
commit | 827fd03483e73ddbd5abe75ceeedfbcdef2a4820 (patch) | |
tree | 701134c953d1429f0b1ac399249d690fdd1d86ee | |
parent | d5b2c5e3d2f1fc4332b415392cd2dbff4c591edc (diff) | |
parent | 688bf7a6f5fed770735471ec3fac40c10f081d06 (diff) | |
download | gitlab-ce-827fd03483e73ddbd5abe75ceeedfbcdef2a4820.tar.gz |
Merge branch '32683-resolved-discussions-icon-is-misaligned' into 'master'
Resolve "Resolved discussions icon is misaligned"
Closes #32683
See merge request !11711
-rw-r--r-- | app/assets/stylesheets/pages/notes.scss | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss index a8a996c1035..a78c2576e0f 100644 --- a/app/assets/stylesheets/pages/notes.scss +++ b/app/assets/stylesheets/pages/notes.scss @@ -673,7 +673,7 @@ ul.notes { .line-resolve-all { vertical-align: middle; display: inline-block; - padding: 6px 10px; + padding: 5px 10px 6px; background-color: $gray-light; border: 1px solid $border-color; border-radius: $border-radius-default; @@ -686,6 +686,10 @@ ul.notes { .line-resolve-btn { margin-right: 5px; + + svg { + vertical-align: middle; + } } } @@ -722,6 +726,10 @@ ul.notes { } } +.line-resolve-text { + vertical-align: middle; +} + .discussion-next-btn { svg { margin: 0; |