diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-09-09 09:47:48 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-09-09 09:47:48 +0000 |
| commit | 0d610270d9634b783137bc6318eff4aa82572a7d (patch) | |
| tree | 470b78370a43acef298ed2239a4f0c461cdac6d6 | |
| parent | 5ff84deb3a852c6d2c88b8ded64213a26784b822 (diff) | |
| parent | c9d78a00c583c0439aeea7416eeea2e50e0d59e4 (diff) | |
| download | gitlab-ce-0d610270d9634b783137bc6318eff4aa82572a7d.tar.gz | |
Merge branch 'ui-improvements' into 'master'
Fix UI bugs with discussions
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
See merge request !1265
| -rw-r--r-- | app/assets/stylesheets/generic/timeline.scss | 19 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/note_form.scss | 6 | ||||
| -rw-r--r-- | app/views/projects/notes/_discussion.html.haml | 2 |
3 files changed, 22 insertions, 5 deletions
diff --git a/app/assets/stylesheets/generic/timeline.scss b/app/assets/stylesheets/generic/timeline.scss index 668a6f848cc..74bbaabad39 100644 --- a/app/assets/stylesheets/generic/timeline.scss +++ b/app/assets/stylesheets/generic/timeline.scss @@ -4,14 +4,19 @@ margin: 0; padding: 0; - > li { + .timeline-entry { padding: $gl-padding; border-color: #f1f2f4; margin-left: -$gl-padding; margin-right: -$gl-padding; color: $gl-gray; + border-bottom: 1px solid #f1f2f4; border-right: 1px solid #f1f2f4; + &:last-child { + border-bottom: none; + } + .avatar { margin-right: 15px; } @@ -33,6 +38,13 @@ color: $gl-gray !important; } } + + .diff-file { + border: 1px solid $border-color; + border-bottom: none; + margin-left: 0; + margin-right: 0; + } } @media (max-width: $screen-xs-max) { @@ -51,3 +63,8 @@ } } } + +.discussion .timeline-entry { + margin: 0; + border-right: none; +} diff --git a/app/assets/stylesheets/pages/note_form.scss b/app/assets/stylesheets/pages/note_form.scss index 85804f5ee61..b311d26d675 100644 --- a/app/assets/stylesheets/pages/note_form.scss +++ b/app/assets/stylesheets/pages/note_form.scss @@ -146,9 +146,9 @@ } .discussion-reply-holder { - background: #f9f9f9; + background: $background-color; padding: 10px 15px; - border-top: 1px solid #DDD; + border-top: 1px solid $border-color; } } @@ -170,6 +170,6 @@ background: #FFF; padding: 5px; margin-top: -11px; - border: 1px solid #DDD; + border: 1px solid $border-color; font-size: 13px; } diff --git a/app/views/projects/notes/_discussion.html.haml b/app/views/projects/notes/_discussion.html.haml index 6daf2d15d07..b8068835b3a 100644 --- a/app/views/projects/notes/_discussion.html.haml +++ b/app/views/projects/notes/_discussion.html.haml @@ -1,5 +1,5 @@ - note = discussion_notes.first -.timeline-entry.prepend-top-default +.timeline-entry .timeline-entry-inner .timeline-icon = link_to user_path(note.author) do |