diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-12-02 14:49:29 +0100 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-12-02 14:49:29 +0100 |
| commit | 1c595681e5b60cfdf402abc6fd43c282897b6260 (patch) | |
| tree | 1865286d994ff69e883783f8a25511ed9750636b | |
| parent | 3ad1d320ef3f3aa5a0896a9b30a2fba791696f58 (diff) | |
| download | gitlab-ce-1c595681e5b60cfdf402abc6fd43c282897b6260.tar.gz | |
Remove double border between gray blocks
| -rw-r--r-- | app/assets/stylesheets/framework/blocks.scss | 4 | ||||
| -rw-r--r-- | app/views/projects/commit/show.html.haml | 5 |
2 files changed, 8 insertions, 1 deletions
diff --git a/app/assets/stylesheets/framework/blocks.scss b/app/assets/stylesheets/framework/blocks.scss index 1635df9c97b..dec50a0e0f6 100644 --- a/app/assets/stylesheets/framework/blocks.scss +++ b/app/assets/stylesheets/framework/blocks.scss @@ -114,3 +114,7 @@ right: 10px; } } + +.block-connector { + margin-top: -1px; +} diff --git a/app/views/projects/commit/show.html.haml b/app/views/projects/commit/show.html.haml index 85e203cbe57..069b8b1f169 100644 --- a/app/views/projects/commit/show.html.haml +++ b/app/views/projects/commit/show.html.haml @@ -1,6 +1,9 @@ - page_title "#{@commit.title} (#{@commit.short_id})", "Commits" = render "projects/commits/header_title" = render "commit_box" -= render "ci_menu" if @ci_commit +- if @ci_commit + = render "ci_menu" +- else + %div.block-connector = render "projects/diffs/diffs", diffs: @diffs, project: @project = render "projects/notes/notes_with_form" |