diff options
| author | Jacob Schatz <jschatz@gitlab.com> | 2016-06-21 19:34:13 +0000 |
|---|---|---|
| committer | Jacob Schatz <jschatz@gitlab.com> | 2016-06-21 19:34:13 +0000 |
| commit | 0f902d51a6b30346b2fb84f751072efa0784cd5e (patch) | |
| tree | 3d64ace3b19bac5770214ca4f481f29ac7c77c1d /app/views/projects | |
| parent | 2527ae6c60bbd230ccca11ef24deec24cdc50742 (diff) | |
| parent | 795b8b3073c3ee65921ec01b5e1cd2524705a7ef (diff) | |
| download | gitlab-ce-0f902d51a6b30346b2fb84f751072efa0784cd5e.tar.gz | |
Merge branch '18934-compare-gray-block' into 'master'
Update gray block under subnav to match other pages
## What does this MR do?
Makes Compare sub nav full width; replaces gray block with white one to match rest of pages
## What are the relevant issue numbers?
Closes #18934
## Screenshots (if relevant)
cc @dzaporozhets
See merge request !4838
Diffstat (limited to 'app/views/projects')
| -rw-r--r-- | app/views/projects/compare/index.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/compare/show.html.haml | 36 |
2 files changed, 19 insertions, 19 deletions
diff --git a/app/views/projects/compare/index.html.haml b/app/views/projects/compare/index.html.haml index c322942aeba..b22285c11e0 100644 --- a/app/views/projects/compare/index.html.haml +++ b/app/views/projects/compare/index.html.haml @@ -3,7 +3,7 @@ = render "projects/commits/head" %div{ class: (container_class) } - .row-content-block.second-block.content-component-block + .sub-header-block Compare branches, tags or commit ranges. %br Fill input field with commit id like diff --git a/app/views/projects/compare/show.html.haml b/app/views/projects/compare/show.html.haml index cdc34f51d6d..f4ec7b767f6 100644 --- a/app/views/projects/compare/show.html.haml +++ b/app/views/projects/compare/show.html.haml @@ -1,24 +1,24 @@ +- @no_container = true - page_title "#{params[:from]}...#{params[:to]}" = render "projects/commits/head" +%div{ class: (container_class) } + .sub-header-block.no-bottom-space + = render "form" -.row-content-block - = render "form" - -- if @commits.present? - .prepend-top-default + - if @commits.present? = render "projects/commits/commit_list" = render "projects/diffs/diffs", diffs: @diffs, project: @project, diff_refs: @diff_refs -- else - .light-well.prepend-top-default - .center - %h4 - There isn't anything to compare. - %p.slead - - if params[:to] == params[:from] - %span.label-branch #{params[:from]} - and - %span.label-branch #{params[:to]} - are the same. - - else - You'll need to use different branch names to get a valid comparison. + - else + .light-well + .center + %h4 + There isn't anything to compare. + %p.slead + - if params[:to] == params[:from] + %span.label-branch #{params[:from]} + and + %span.label-branch #{params[:to]} + are the same. + - else + You'll need to use different branch names to get a valid comparison. |