diff options
author | Annabel Dunstone <annabel.dunstone@gmail.com> | 2016-04-01 14:27:39 -0500 |
---|---|---|
committer | Annabel Dunstone <annabel.dunstone@gmail.com> | 2016-04-07 15:33:18 -0700 |
commit | dab4ac54b691f1c832b1fe444859c3183a231411 (patch) | |
tree | 0e3cd6fe0fc30060e19090bc18ab753731f23e1f /app/assets/stylesheets/pages | |
parent | 3cfeb3755828871813cd12c771fa7efddf67edb5 (diff) | |
download | gitlab-ce-dab4ac54b691f1c832b1fe444859c3183a231411.tar.gz |
Diff design updates
Diffstat (limited to 'app/assets/stylesheets/pages')
-rw-r--r-- | app/assets/stylesheets/pages/diff.scss | 8 | ||||
-rw-r--r-- | app/assets/stylesheets/pages/note_form.scss | 6 | ||||
-rw-r--r-- | app/assets/stylesheets/pages/notes.scss | 44 |
3 files changed, 26 insertions, 32 deletions
diff --git a/app/assets/stylesheets/pages/diff.scss b/app/assets/stylesheets/pages/diff.scss index 97f4485beb8..5a99fffb540 100644 --- a/app/assets/stylesheets/pages/diff.scss +++ b/app/assets/stylesheets/pages/diff.scss @@ -2,6 +2,7 @@ .diff-file { border: 1px solid $border-color; margin-bottom: $gl-padding; + border-radius: 3px; .diff-header { position: relative; @@ -31,6 +32,7 @@ overflow-y: hidden; background: #fff; color: #333; + border-radius: 0 0 3px 3px; .unfold { cursor: pointer; @@ -325,6 +327,12 @@ float: right; } +.diffs { + .content-block { + border-bottom: none; + } +} + // Mobile @media (max-width: 480px) { .diff-title { diff --git a/app/assets/stylesheets/pages/note_form.scss b/app/assets/stylesheets/pages/note_form.scss index 9aec2c60e15..a6427f1912e 100644 --- a/app/assets/stylesheets/pages/note_form.scss +++ b/app/assets/stylesheets/pages/note_form.scss @@ -1,11 +1,6 @@ /** * Note Form */ -.reply-btn { - @extend .btn-primary; - margin: 10px $gl-padding; -} - .comment-btn { @extend .btn-create; } @@ -118,7 +113,6 @@ .discussion-body, .diff-file { .notes .note { - border-color: #ddd; padding: 10px 15px; } diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss index 93fcb81321a..7295fe51121 100644 --- a/app/assets/stylesheets/pages/notes.scss +++ b/app/assets/stylesheets/pages/notes.scss @@ -58,6 +58,7 @@ ul.notes { .note { display: block; position: relative; + border-bottom: 1px solid $table-border-gray; &.is-editting { .note-header, @@ -117,9 +118,6 @@ ul.notes { padding-bottom: 3px; } - &:last-child { - border-bottom: 1px solid $border-color; - } } } @@ -137,14 +135,14 @@ ul.notes { font-family: $regular_font; td { - border: 1px solid #ddd; + border: 1px solid $table-border-gray; border-left: none; &.notes_line { vertical-align: middle; text-align: center; padding: 10px 0; - background: #fff; + background: $background-color; color: $text-color; } &.notes_line2 { @@ -175,9 +173,6 @@ ul.notes { } } - .author_link { - font-weight: 600; - } } .note-headline-light, @@ -194,21 +189,6 @@ ul.notes { float: right; margin-left: 10px; color: $notes-action-color; - - .js-note-delete { - &:hover { - @extend .cgray; - &.danger { @extend .cred; } - } - } - - .js-note-edit { - i { - &:hover { - color: $gl-link-color; - } - } - } } .note-action-button, @@ -218,14 +198,26 @@ ul.notes { line-height: 24px; .fa { + color: $notes-action-color; position: relative; top: 1px; font-size: 17px; } - .fa-trash-o { - top: 0; - font-size: 16px; + &.js-note-delete { + i { + &:hover { + color: $gl-text-red; + } + } + } + + &.js-note-edit { + i { + &:hover { + color: $gl-link-color; + } + } } } |