diff options
| author | Jacob Schatz <jschatz@gitlab.com> | 2016-06-09 00:28:36 +0300 |
|---|---|---|
| committer | Jacob Schatz <jschatz@gitlab.com> | 2016-06-09 00:28:36 +0300 |
| commit | 8578f4011a0575717ca5eee02b77bf90bd9e21e0 (patch) | |
| tree | 475750c039a5c59c8d709e1a1b5146120063d7d5 | |
| parent | b4812e2e867d1b738fc93afb3c5e5d1fd57ccd1d (diff) | |
| parent | f367582ffe275dde4a0bd5ef281fd9e93e7586e5 (diff) | |
Merge branch '18333-layout-bug' into 'master'
Use container helper instead of hard coded container
## What does this MR do?
Add `container_class` helper class to fix layout bug
## What are the relevant issue numbers?
#18333
## Screenshots (if relevant)
Fixed:
Fluid:
See merge request !4543
| -rw-r--r-- | app/views/groups/show.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/_home_panel.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/show.html.haml | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/app/views/groups/show.html.haml b/app/views/groups/show.html.haml index 54e89a0191f..85635bc4616 100644 --- a/app/views/groups/show.html.haml +++ b/app/views/groups/show.html.haml @@ -5,7 +5,7 @@ = auto_discovery_link_tag(:atom, group_url(@group, format: :atom, private_token: current_user.private_token), title: "#{@group.name} activity") .cover-block.groups-cover-block - .container-fluid.container-limited + %div{ class: (container_class) } = link_to group_icon(@group), target: '_blank' do = image_tag group_icon(@group), class: "avatar group-avatar s70" .group-info diff --git a/app/views/projects/_home_panel.html.haml b/app/views/projects/_home_panel.html.haml index f0e04a0235d..f5bc1b4e409 100644 --- a/app/views/projects/_home_panel.html.haml +++ b/app/views/projects/_home_panel.html.haml @@ -1,6 +1,6 @@ - empty_repo = @project.empty_repo? .project-home-panel.cover-block.clearfix{:class => ("empty-project" if empty_repo)} - .container-fluid.container-limited + %div{ class: (container_class) } .row .project-image-container = project_icon(@project, alt: '', class: 'project-avatar avatar s70') diff --git a/app/views/projects/show.html.haml b/app/views/projects/show.html.haml index a19c7c406a0..4afa902b4eb 100644 --- a/app/views/projects/show.html.haml +++ b/app/views/projects/show.html.haml @@ -13,7 +13,7 @@ = render "home_panel" .project-stats.row-content-block.second-block - .container-fluid.container-limited + %div{ class: (container_class) } %ul.nav %li = link_to project_files_path(@project) do |