Merge branch 'fix/adjust-layout-width-for-fixed-layout' into 'master'

Adjust layout width for fixed layout #41830

Closes #41830

See merge request gitlab-org/gitlab-ce!16337

10 files changed, 31 insertions, 27 deletions

diff --git a/app/views/dashboard/activity.html.haml b/app/views/dashboard/activity.html.haml
index ad35d05c29a..31d4b3da4f1 100644
--- a/app/views/dashboard/activity.html.haml
+++ b/app/views/dashboard/activity.html.haml
@@ -7,10 +7,8 @@
 - page_title    "Activity"
 - header_title  "Activity", activity_dashboard_path
 
-.hidden-xs
-  = render "projects/last_push"
-
 %div{ class: container_class }
+  = render "projects/last_push"
   = render 'dashboard/activity_head'
 
   %section.activities
diff --git a/app/views/dashboard/projects/index.html.haml b/app/views/dashboard/projects/index.html.haml
index 57a4da353fe..deed774a4a5 100644
--- a/app/views/dashboard/projects/index.html.haml
+++ b/app/views/dashboard/projects/index.html.haml
@@ -7,9 +7,8 @@
 - page_title    "Projects"
 - header_title  "Projects", dashboard_projects_path
 
-= render "projects/last_push"
-
 %div{ class: container_class }
+  = render "projects/last_push"
   - if show_projects?(@projects, params)
     = render 'dashboard/projects_head'
     = render 'nav'
diff --git a/app/views/dashboard/projects/starred.html.haml b/app/views/dashboard/projects/starred.html.haml
index 14f9f8cd70a..b1efe59aadc 100644
--- a/app/views/dashboard/projects/starred.html.haml
+++ b/app/views/dashboard/projects/starred.html.haml
@@ -4,9 +4,8 @@
 - page_title "Starred Projects"
 - header_title "Projects", dashboard_projects_path
 
-= render "projects/last_push"
-
 %div{ class: container_class }
+  = render "projects/last_push"
   = render 'dashboard/projects_head'
 
   - if params[:filter_projects] || any_projects?(@projects)
diff --git a/app/views/projects/_last_push.html.haml b/app/views/projects/_last_push.html.haml
index b68eb47c6b4..56eecece54c 100644
--- a/app/views/projects/_last_push.html.haml
+++ b/app/views/projects/_last_push.html.haml
@@ -1,19 +1,18 @@
 - event = last_push_event
 - if event && show_last_push_widget?(event)
-  %div{ class: container_class }
-    .row-content-block.top-block.hidden-xs.white
-      .event-last-push
-        .event-last-push-text
-          %span= s_("LastPushEvent|You pushed to")
-          %strong
-            = link_to event.ref_name, project_commits_path(event.project, event.ref_name), class: 'ref-name'
+  .row-content-block.top-block.hidden-xs.white
+    .event-last-push
+      .event-last-push-text
+        %span= s_("LastPushEvent|You pushed to")
+        %strong
+          = link_to event.ref_name, project_commits_path(event.project, event.ref_name), class: 'ref-name'
 
-          - if event.project != @project
-            %span= s_("LastPushEvent|at")
-            %strong= link_to_project event.project
+        - if event.project != @project
+          %span= s_("LastPushEvent|at")
+          %strong= link_to_project event.project
 
-          #{time_ago_with_tooltip(event.created_at)}
+        #{time_ago_with_tooltip(event.created_at)}
 
-        .pull-right
-          = link_to new_mr_path_from_push_event(event), title: _("New merge request"), class: "btn btn-info btn-sm" do
-            #{ _('Create merge request') }
+      .pull-right
+        = link_to new_mr_path_from_push_event(event), title: _("New merge request"), class: "btn btn-info btn-sm" do
+          #{ _('Create merge request') }
diff --git a/app/views/projects/activity.html.haml b/app/views/projects/activity.html.haml
index d0ab39033cf..b28a375e956 100644
--- a/app/views/projects/activity.html.haml
+++ b/app/views/projects/activity.html.haml
@@ -2,6 +2,7 @@
 
 - page_title _("Activity")
 
-= render 'projects/last_push'
+%div{ class: container_class }
+  = render 'projects/last_push'
 
 = render 'projects/activity'
diff --git a/app/views/projects/blob/show.html.haml b/app/views/projects/blob/show.html.haml
index 4d358052d43..2ed454131af 100644
--- a/app/views/projects/blob/show.html.haml
+++ b/app/views/projects/blob/show.html.haml
@@ -6,9 +6,10 @@
 - content_for :page_specific_javascripts do
   = webpack_bundle_tag 'blob'
 
-= render 'projects/last_push'
 
 %div{ class: container_class }
+  = render 'projects/last_push'
+
   #tree-holder.tree-holder
     = render 'blob', blob: @blob
 
diff --git a/app/views/projects/merge_requests/index.html.haml b/app/views/projects/merge_requests/index.html.haml
index 2ded7484151..640d2791dc1 100644
--- a/app/views/projects/merge_requests/index.html.haml
+++ b/app/views/projects/merge_requests/index.html.haml
@@ -10,7 +10,8 @@
   = webpack_bundle_tag 'common_vue'
   = webpack_bundle_tag 'filtered_search'
 
-= render 'projects/last_push'
+%div{ class: container_class }
+  = render 'projects/last_push'
 
 - if @project.merge_requests.exists?
   %div{ class: container_class }
diff --git a/app/views/projects/show.html.haml b/app/views/projects/show.html.haml
index 7a68aa16aa4..d3e867e124c 100644
--- a/app/views/projects/show.html.haml
+++ b/app/views/projects/show.html.haml
@@ -7,7 +7,9 @@
 
 = render partial: 'flash_messages', locals: { project: @project }
 
-= render "projects/last_push"
+%div{ class: [container_class, ("limit-container-width" unless fluid_layout)] }
+  = render "projects/last_push"
+
 = render "home_panel"
 
 - if can?(current_user, :download_code, @project)
diff --git a/app/views/projects/tree/show.html.haml b/app/views/projects/tree/show.html.haml
index 709be20e00f..3b4057e56d0 100644
--- a/app/views/projects/tree/show.html.haml
+++ b/app/views/projects/tree/show.html.haml
@@ -6,7 +6,6 @@
 = content_for :meta_tags do
   = auto_discovery_link_tag(:atom, project_commits_url(@project, @ref, rss_url_options), title: "#{@project.name}:#{@ref} commits")
 
-= render 'projects/last_push'
-
 %div{ class: [(container_class), ("limit-container-width" unless fluid_layout)] }
+  = render 'projects/last_push'
   = render 'projects/files', commit: @last_commit, project: @project, ref: @ref, content_url: project_tree_path(@project, @id)
diff --git a/changelogs/unreleased/fix-adjust-layout-width-for-fixed-layout.yml b/changelogs/unreleased/fix-adjust-layout-width-for-fixed-layout.yml
new file mode 100644
index 00000000000..2e0f59f81e9
--- /dev/null
+++ b/changelogs/unreleased/fix-adjust-layout-width-for-fixed-layout.yml
@@ -0,0 +1,5 @@
+---
+title: Adjust layout width for fixed layout
+merge_request: 16337
+author: George Tsiolis
+type: fixed