diff options
| author | Annabel Dunstone <annabel.dunstone@gmail.com> | 2016-04-07 12:36:53 -0700 |
|---|---|---|
| committer | Annabel Dunstone <annabel.dunstone@gmail.com> | 2016-04-07 15:33:18 -0700 |
| commit | d76878b96040c8ae4752600aceb30200fa0049a0 (patch) | |
| tree | 3eb5f43995762f24df4682153293adf15b6ad2ce | |
| parent | 6ee2069768279a9f9e03ae20f10b906a807a5eb7 (diff) | |
| download | gitlab-ce-d76878b96040c8ae4752600aceb30200fa0049a0.tar.gz | |
Diff touch ups
| -rw-r--r-- | app/assets/stylesheets/highlight/white.scss | 2 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/diff.scss | 5 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/note_form.scss | 9 | ||||
| -rw-r--r-- | app/views/projects/diffs/_diffs.html.haml | 2 | ||||
| -rw-r--r-- | features/project/commits/diff_comments.feature | 1 |
5 files changed, 8 insertions, 11 deletions
diff --git a/app/assets/stylesheets/highlight/white.scss b/app/assets/stylesheets/highlight/white.scss index d68a28bbfd5..28331f59754 100644 --- a/app/assets/stylesheets/highlight/white.scss +++ b/app/assets/stylesheets/highlight/white.scss @@ -6,7 +6,7 @@ } .diff-line-num, .diff-line-num a { - color: #8f8f8f; + color: $black-transparent; } // Code itself diff --git a/app/assets/stylesheets/pages/diff.scss b/app/assets/stylesheets/pages/diff.scss index 5a99fffb540..d0855f66911 100644 --- a/app/assets/stylesheets/pages/diff.scss +++ b/app/assets/stylesheets/pages/diff.scss @@ -11,6 +11,7 @@ padding: 10px 16px; color: #555; z-index: 10; + border-radius: 3px 3px 0 0; .diff-title { font-family: $monospace_font; @@ -333,6 +334,10 @@ } } +.files-changed { + 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 a6427f1912e..4d4d508396d 100644 --- a/app/assets/stylesheets/pages/note_form.scss +++ b/app/assets/stylesheets/pages/note_form.scss @@ -182,12 +182,3 @@ float: left; } } - -.note-reply-field { - background-color: $background-color; - - &:focus { - box-shadow: none; - border-color: $border-color; - } -} diff --git a/app/views/projects/diffs/_diffs.html.haml b/app/views/projects/diffs/_diffs.html.haml index 2e1a37aa06d..eaab99973a4 100644 --- a/app/views/projects/diffs/_diffs.html.haml +++ b/app/views/projects/diffs/_diffs.html.haml @@ -3,7 +3,7 @@ - diff_files = safe_diff_files(diffs, diff_refs) -.content-block.oneline-block +.content-block.oneline-block.files-changed .inline-parallel-buttons .btn-group = inline_diff_btn diff --git a/features/project/commits/diff_comments.feature b/features/project/commits/diff_comments.feature index 1dda2ff8a6d..2bde4c8a99b 100644 --- a/features/project/commits/diff_comments.feature +++ b/features/project/commits/diff_comments.feature @@ -60,6 +60,7 @@ Feature: Project Commits Diff Comments Scenario: I have a reply button in discussions Given I leave a diff comment like "Typo, please fix" Then I should see a discussion reply button + @javascript Scenario: I can preview with text Given I open a diff comment form |