diff options
Diffstat (limited to 'app/assets/stylesheets/pages/notes.scss')
| -rw-r--r-- | app/assets/stylesheets/pages/notes.scss | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss index c5b644bd72f..005fbc8b058 100644 --- a/app/assets/stylesheets/pages/notes.scss +++ b/app/assets/stylesheets/pages/notes.scss @@ -100,10 +100,13 @@ $system-note-icon-m-left: $avatar-m-left + $icon-size-diff / $avatar-m-ratio; margin-left: 2.5rem; border: 1px solid $border-color; border-radius: $gl-border-radius-base; - background-color: $white; padding: $gl-padding-4 $gl-padding-8; } + &:not(.target) .timeline-content:not(.flash-container) { + background-color: $white; + } + &.draft-note .timeline-content:not(.flash-container) { border: 0; } @@ -139,11 +142,14 @@ $system-note-icon-m-left: $avatar-m-left + $icon-size-diff / $avatar-m-ratio; border-top: 1px solid $border-color; border-top-left-radius: $gl-border-radius-base; border-top-right-radius: $gl-border-radius-base; - background-color: $white; padding: $gl-padding-4 $gl-padding-8; } } + &:not(.target) .timeline-content:not(.flash-container) { + background-color: $white; + } + &.draft-note .timeline-content:not(.flash-container) { margin-left: 0; border-top-left-radius: 0; @@ -239,15 +245,6 @@ $system-note-icon-m-left: $avatar-m-left + $icon-size-diff / $avatar-m-ratio; } } - .discussion-toggle-replies { - border-top: 0; - border-radius: 4px 4px 0 0; - - &.collapsed { - border-radius: 4px; - } - } - .note-created-ago, .note-updated-at { white-space: normal; @@ -1090,6 +1087,7 @@ $system-note-icon-m-left: $avatar-m-left + $icon-size-diff / $avatar-m-ratio; margin-left: 0; border-left: 0; border-right: 0; + border-radius: 0 !important; } .discussion-reply-holder { |