diff options
author | Filipa Lacerda <filipa@gitlab.com> | 2018-11-16 13:44:48 +0000 |
---|---|---|
committer | Cindy Pallares <cindy@gitlab.com> | 2018-11-19 19:03:13 -0500 |
commit | 1816de19c76c1a0769091af1661aa1421c3ef26b (patch) | |
tree | a2eaed87038ceb3604fdbf311aca57905f5d33eb | |
parent | 430436c26e3e3c16452b1f5fc33fcb3cea5fd7aa (diff) | |
download | gitlab-ce-1816de19c76c1a0769091af1661aa1421c3ef26b.tar.gz |
Merge branch 'image-discussion-ff-fix' into 'master'
Fixed image discussion styling
Closes #54110
See merge request gitlab-org/gitlab-ce!23127
(cherry picked from commit ef1a158773c7cfbf681df6ed7f3514963ad8ca1b)
718c66f6 Fixed image discussion styling
-rw-r--r-- | app/assets/stylesheets/framework/files.scss | 1 | ||||
-rw-r--r-- | app/assets/stylesheets/pages/diff.scss | 14 | ||||
-rw-r--r-- | app/assets/stylesheets/pages/notes.scss | 8 |
3 files changed, 10 insertions, 13 deletions
diff --git a/app/assets/stylesheets/framework/files.scss b/app/assets/stylesheets/framework/files.scss index 6bdcb20210b..037a5adfb7e 100644 --- a/app/assets/stylesheets/framework/files.scss +++ b/app/assets/stylesheets/framework/files.scss @@ -415,7 +415,6 @@ span.idiff { } .preview-container { - height: 100%; overflow: auto; .file-container { diff --git a/app/assets/stylesheets/pages/diff.scss b/app/assets/stylesheets/pages/diff.scss index 6d998fa1e07..3c7bf0b0e46 100644 --- a/app/assets/stylesheets/pages/diff.scss +++ b/app/assets/stylesheets/pages/diff.scss @@ -842,11 +842,15 @@ background-repeat: repeat; } - .diff-file-discussions + .discussion-form::before { - width: auto; - margin-left: -16px; - margin-right: -16px; - margin-bottom: 16px; + .diff-file-discussions + .discussion-form { + padding: $gl-padding; + + &::before { + width: auto; + margin-left: -$gl-padding; + margin-right: -$gl-padding; + margin-bottom: $gl-padding; + } } .notes { diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss index 1f34537d856..085ff27e6ef 100644 --- a/app/assets/stylesheets/pages/notes.scss +++ b/app/assets/stylesheets/pages/notes.scss @@ -433,14 +433,8 @@ $note-form-margin-left: 72px; } .discussion-notes { - &:not(:first-child) { - border-top: 1px solid $white-normal; - margin-top: 20px; - } - &:not(:last-child) { - border-bottom: 1px solid $white-normal; - margin-bottom: 20px; + margin-bottom: 0; } .system-note { |