Commit 5f9ed9c7 authored by Phil Hughes's avatar Phil Hughes

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
parents e98aa5e1 c306c6da
...@@ -7,10 +7,8 @@ ...@@ -7,10 +7,8 @@
- page_title "Activity" - page_title "Activity"
- header_title "Activity", activity_dashboard_path - header_title "Activity", activity_dashboard_path
.hidden-xs
= render "projects/last_push"
%div{ class: container_class } %div{ class: container_class }
= render "projects/last_push"
= render 'dashboard/activity_head' = render 'dashboard/activity_head'
%section.activities %section.activities
......
...@@ -7,9 +7,8 @@ ...@@ -7,9 +7,8 @@
- page_title "Projects" - page_title "Projects"
- header_title "Projects", dashboard_projects_path - header_title "Projects", dashboard_projects_path
= render "projects/last_push"
%div{ class: container_class } %div{ class: container_class }
= render "projects/last_push"
- if show_projects?(@projects, params) - if show_projects?(@projects, params)
= render 'dashboard/projects_head' = render 'dashboard/projects_head'
= render 'nav' = render 'nav'
......
...@@ -4,9 +4,8 @@ ...@@ -4,9 +4,8 @@
- page_title "Starred Projects" - page_title "Starred Projects"
- header_title "Projects", dashboard_projects_path - header_title "Projects", dashboard_projects_path
= render "projects/last_push"
%div{ class: container_class } %div{ class: container_class }
= render "projects/last_push"
= render 'dashboard/projects_head' = render 'dashboard/projects_head'
- if params[:filter_projects] || any_projects?(@projects) - if params[:filter_projects] || any_projects?(@projects)
......
- event = last_push_event - event = last_push_event
- if event && show_last_push_widget?(event) - if event && show_last_push_widget?(event)
%div{ class: container_class }
.row-content-block.top-block.hidden-xs.white .row-content-block.top-block.hidden-xs.white
.event-last-push .event-last-push
.event-last-push-text .event-last-push-text
......
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
- page_title _("Activity") - page_title _("Activity")
= render 'projects/last_push' %div{ class: container_class }
= render 'projects/last_push'
= render 'projects/activity' = render 'projects/activity'
...@@ -6,9 +6,10 @@ ...@@ -6,9 +6,10 @@
- content_for :page_specific_javascripts do - content_for :page_specific_javascripts do
= webpack_bundle_tag 'blob' = webpack_bundle_tag 'blob'
= render 'projects/last_push'
%div{ class: container_class } %div{ class: container_class }
= render 'projects/last_push'
#tree-holder.tree-holder #tree-holder.tree-holder
= render 'blob', blob: @blob = render 'blob', blob: @blob
......
...@@ -10,7 +10,8 @@ ...@@ -10,7 +10,8 @@
= webpack_bundle_tag 'common_vue' = webpack_bundle_tag 'common_vue'
= webpack_bundle_tag 'filtered_search' = webpack_bundle_tag 'filtered_search'
= render 'projects/last_push' %div{ class: container_class }
= render 'projects/last_push'
- if @project.merge_requests.exists? - if @project.merge_requests.exists?
%div{ class: container_class } %div{ class: container_class }
......
...@@ -7,7 +7,9 @@ ...@@ -7,7 +7,9 @@
= render partial: 'flash_messages', locals: { project: @project } = 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" = render "home_panel"
- if can?(current_user, :download_code, @project) - if can?(current_user, :download_code, @project)
......
...@@ -6,7 +6,6 @@ ...@@ -6,7 +6,6 @@
= content_for :meta_tags do = content_for :meta_tags do
= auto_discovery_link_tag(:atom, project_commits_url(@project, @ref, rss_url_options), title: "#{@project.name}:#{@ref} commits") = 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)] } %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) = render 'projects/files', commit: @last_commit, project: @project, ref: @ref, content_url: project_tree_path(@project, @id)
---
title: Adjust layout width for fixed layout
merge_request: 16337
author: George Tsiolis
type: fixed
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment