From 3741402a241df2ad6ab28e4b76edafe5083ce733 Mon Sep 17 00:00:00 2001
From: Fatih Acet <acetfatih@gmail.com>
Date: Tue, 3 Sep 2019 09:03:35 +0000
Subject: Make flash notifications sticky

This commit also unifies layout structure
and remove no_container flag
---
 app/views/projects/compare/index.html.haml | 26 +++++++++----------
 app/views/projects/compare/show.html.haml  | 40 ++++++++++++++----------------
 2 files changed, 31 insertions(+), 35 deletions(-)

(limited to 'app/views/projects/compare')

diff --git a/app/views/projects/compare/index.html.haml b/app/views/projects/compare/index.html.haml
index 14c64b3534a..02f2b104ce3 100644
--- a/app/views/projects/compare/index.html.haml
+++ b/app/views/projects/compare/index.html.haml
@@ -1,18 +1,16 @@
-- @no_container = true
 - breadcrumb_title "Compare Revisions"
 - page_title "Compare"
 
-%div{ class: container_class }
-  %h3.page-title
-    = _("Compare Git revisions")
-  .sub-header-block
-    - example_master = capture do
-      %code.ref-name master
-    - example_sha = capture do
-      %code.ref-name 4eedf23
-    = (_("Choose a branch/tag (e.g. %{master}) or enter a commit (e.g. %{sha}) to see what's changed or to create a merge request.") % { master: example_master, sha: example_sha }).html_safe
-    %br
-    = (_("Changes are shown as if the <b>source</b> revision was being merged into the <b>target</b> revision.")).html_safe
+%h3.page-title
+  = _("Compare Git revisions")
+.sub-header-block
+  - example_master = capture do
+    %code.ref-name master
+  - example_sha = capture do
+    %code.ref-name 4eedf23
+  = (_("Choose a branch/tag (e.g. %{master}) or enter a commit (e.g. %{sha}) to see what's changed or to create a merge request.") % { master: example_master, sha: example_sha }).html_safe
+  %br
+  = (_("Changes are shown as if the <b>source</b> revision was being merged into the <b>target</b> revision.")).html_safe
 
-  .prepend-top-20
-    = render "form"
+.prepend-top-20
+  = render "form"
diff --git a/app/views/projects/compare/show.html.haml b/app/views/projects/compare/show.html.haml
index 5774b48a054..51cf95dc84b 100644
--- a/app/views/projects/compare/show.html.haml
+++ b/app/views/projects/compare/show.html.haml
@@ -1,25 +1,23 @@
-- @no_container = true
 - add_to_breadcrumbs _("Compare Revisions"), project_compare_index_path(@project)
 - page_title "#{params[:from]}...#{params[:to]}"
 
-%div{ class: container_class }
-  .sub-header-block.no-bottom-space
-    = render "form"
+.sub-header-block.no-bottom-space
+  = render "form"
 
-  - if @commits.present?
-    = render "projects/commits/commit_list"
-    = render "projects/diffs/diffs", diffs: @diffs, environment: @environment, diff_page_context: "is-compare"
-  - else
-    .card.bg-light
-      .center
-        %h4
-          = s_("CompareBranches|There isn't anything to compare.")
-        %p.slead
-          - if params[:to] == params[:from]
-            - source_branch = capture do
-              %span.ref-name= params[:from]
-            - target_branch = capture do
-              %span.ref-name= params[:to]
-            = (s_("CompareBranches|%{source_branch} and %{target_branch} are the same.") % { source_branch: source_branch, target_branch: target_branch }).html_safe
-          - else
-            = _("You'll need to use different branch names to get a valid comparison.")
+- if @commits.present?
+  = render "projects/commits/commit_list"
+  = render "projects/diffs/diffs", diffs: @diffs, environment: @environment, diff_page_context: "is-compare"
+- else
+  .card.bg-light
+    .center
+      %h4
+        = s_("CompareBranches|There isn't anything to compare.")
+      %p.slead
+        - if params[:to] == params[:from]
+          - source_branch = capture do
+            %span.ref-name= params[:from]
+          - target_branch = capture do
+            %span.ref-name= params[:to]
+          = (s_("CompareBranches|%{source_branch} and %{target_branch} are the same.") % { source_branch: source_branch, target_branch: target_branch }).html_safe
+        - else
+          = _("You'll need to use different branch names to get a valid comparison.")
-- 
cgit v1.2.1