Commit view correctly spans the full width when parallel view

Closes #30881
This commit is contained in:
Phil Hughes 2017-04-21 15:09:37 +01:00
parent d35515cb5b
commit 3f2578bce5
4 changed files with 38 additions and 4 deletions

View File

@ -6,7 +6,13 @@
}
.limit-container-width {
.detail-page-header {
.detail-page-header,
.page-content-header,
.commit-box,
.info-well,
.notes,
.commit-ci-menu,
.files-changed {
@extend .fixed-width-container;
}
@ -36,8 +42,7 @@
}
.diffs {
.mr-version-controls,
.files-changed {
.mr-version-controls {
@extend .fixed-width-container;
}
}

View File

@ -1,9 +1,11 @@
- @no_container = true
- container_class = !fluid_layout && diff_view == :inline ? 'container-limited' : ''
- limited_container_width = fluid_layout || diff_view == :inline ? '' : 'limit-container-width'
- page_title "#{@commit.title} (#{@commit.short_id})", "Commits"
- page_description @commit.description
= render "projects/commits/head"
%div{ class: container_class }
%div.container-fluid{ class: [limited_container_width, container_class] }
= render "commit_box"
- if @commit.status
= render "ci_menu"

View File

@ -0,0 +1,4 @@
---
title: Side-by-side view in commits correcly expands full window width
merge_request:
author:

View File

@ -0,0 +1,23 @@
require 'spec_helper'
describe 'Commit container', :js, :feature do
let(:user) { create(:user) }
let(:project) { create(:project) }
before do
project.team << [user, :master]
login_as(user)
end
it 'keeps container-limited when view type is inline' do
visit namespace_project_commit_path(project.namespace, project, project.commit.id, view: :inline)
expect(page).not_to have_selector('.limit-container-width')
end
it 'diff spans full width when view type is parallel' do
visit namespace_project_commit_path(project.namespace, project, project.commit.id, view: :parallel)
expect(page).to have_selector('.limit-container-width')
end
end