summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorJustin Boyson <jboyson@gitlab.com>2019-06-07 17:30:11 +0000
committerAnnabel Dunstone Gray <annabel.m.gray@gmail.com>2019-06-07 17:30:11 +0000
commit81d66a27879e46de0d3b90fe9bc70a7b225a7cfb (patch)
tree4e997dc40da806e36476485c489756d83d20fc00 /app
parentdddb61a4c0620a1b3b9c3d734b2467d73be20897 (diff)
downloadgitlab-ce-81d66a27879e46de0d3b90fe9bc70a7b225a7cfb.tar.gz
Fix discusson resolve toggle making page jump
Diffstat (limited to 'app')
-rw-r--r--app/assets/stylesheets/pages/notes.scss8
1 files changed, 5 insertions, 3 deletions
diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss
index da341121087..d3aad23aa75 100644
--- a/app/assets/stylesheets/pages/notes.scss
+++ b/app/assets/stylesheets/pages/notes.scss
@@ -569,7 +569,7 @@ $note-form-margin-left: 72px;
}
.discussion-header {
- min-height: 72px;
+ min-height: 74px;
.note-header-info {
padding-bottom: 0;
@@ -582,8 +582,10 @@ $note-form-margin-left: 72px;
}
.unresolved {
- .note-header-info {
- margin-top: $gl-padding-8;
+ .discussion-header {
+ .note-header-info {
+ margin-top: $gl-padding-8;
+ }
}
}