Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Léo-Paul Géneau
gitlab-ce
Commits
3f2578bc
Commit
3f2578bc
authored
Apr 21, 2017
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit view correctly spans the full width when parallel view
Closes #30881
parent
d35515cb
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
38 additions
and
4 deletions
+38
-4
app/assets/stylesheets/pages/issuable.scss
app/assets/stylesheets/pages/issuable.scss
+8
-3
app/views/projects/commit/show.html.haml
app/views/projects/commit/show.html.haml
+3
-1
changelogs/unreleased/commit-limited-container-width.yml
changelogs/unreleased/commit-limited-container-width.yml
+4
-0
spec/features/projects/commit/container_spec.rb
spec/features/projects/commit/container_spec.rb
+23
-0
No files found.
app/assets/stylesheets/pages/issuable.scss
View file @
3f2578bc
...
@@ -6,7 +6,13 @@
...
@@ -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 @@
...
@@ -36,8 +42,7 @@
}
}
.diffs
{
.diffs
{
.mr-version-controls
,
.mr-version-controls
{
.files-changed
{
@extend
.fixed-width-container
;
@extend
.fixed-width-container
;
}
}
}
}
...
...
app/views/projects/commit/show.html.haml
View file @
3f2578bc
-
@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"
...
...
changelogs/unreleased/commit-limited-container-width.yml
0 → 100644
View file @
3f2578bc
---
title
:
Side-by-side view in commits correcly expands full window width
merge_request
:
author
:
spec/features/projects/commit/container_spec.rb
0 → 100644
View file @
3f2578bc
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
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment