Commit view correctly spans the full width when parallel view
Closes #30881
This commit is contained in:
parent
d35515cb5b
commit
3f2578bce5
|
@ -6,7 +6,13 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
.limit-container-width {
|
.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;
|
@extend .fixed-width-container;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -36,8 +42,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
.diffs {
|
.diffs {
|
||||||
.mr-version-controls,
|
.mr-version-controls {
|
||||||
.files-changed {
|
|
||||||
@extend .fixed-width-container;
|
@extend .fixed-width-container;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,9 +1,11 @@
|
||||||
- @no_container = true
|
- @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_title "#{@commit.title} (#{@commit.short_id})", "Commits"
|
||||||
- page_description @commit.description
|
- page_description @commit.description
|
||||||
= render "projects/commits/head"
|
= render "projects/commits/head"
|
||||||
|
|
||||||
%div{ class: container_class }
|
%div.container-fluid{ class: [limited_container_width, container_class] }
|
||||||
= render "commit_box"
|
= render "commit_box"
|
||||||
- if @commit.status
|
- if @commit.status
|
||||||
= render "ci_menu"
|
= render "ci_menu"
|
||||||
|
|
|
@ -0,0 +1,4 @@
|
||||||
|
---
|
||||||
|
title: Side-by-side view in commits correcly expands full window width
|
||||||
|
merge_request:
|
||||||
|
author:
|
|
@ -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
|
Loading…
Reference in New Issue