diff options
author | Natalia Tepluhina <ntepluhina@gitlab.com> | 2019-07-03 08:26:57 +0000 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2019-07-03 08:26:57 +0000 |
commit | d4151b14c2986db173a7a1a4d293b86bfcdaae3a (patch) | |
tree | f3bb3b6829671ddeb17dd4f373b3e358187df7b8 /app/assets/stylesheets/pages/notes.scss | |
parent | fd547ee4c618ab8d93ba07121e7bc6bf2924a1b3 (diff) | |
download | gitlab-ce-d4151b14c2986db173a7a1a4d293b86bfcdaae3a.tar.gz |
Rebased and squashed commits
- all commits squashed to make danger review happy
Diffstat (limited to 'app/assets/stylesheets/pages/notes.scss')
-rw-r--r-- | app/assets/stylesheets/pages/notes.scss | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss index e880b941d67..7bd1a4138e4 100644 --- a/app/assets/stylesheets/pages/notes.scss +++ b/app/assets/stylesheets/pages/notes.scss @@ -134,6 +134,16 @@ $note-form-margin-left: 72px; } } + .discussion-toggle-replies { + border-top: 0; + border-radius: 4px 4px 0 0; + + &.collapsed { + border: 0; + border-radius: 4px; + } + } + .note-created-ago, .note-updated-at { white-space: normal; @@ -462,6 +472,14 @@ $note-form-margin-left: 72px; position: relative; } + .notes-content .discussion-notes.diff-discussions { + border-bottom: 1px solid $border-color; + + &:nth-last-child(1) { + border-bottom: 0; + } + } + .notes_holder { font-family: $regular-font; @@ -517,6 +535,17 @@ $note-form-margin-left: 72px; .discussion-reply-holder { border-radius: 0 0 $border-radius-default $border-radius-default; position: relative; + + .discussion-form { + width: 100%; + background-color: $gray-light; + padding: 0; + } + + .disabled-comment { + padding: $gl-vert-padding 0; + width: 100%; + } } } |