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
Tatuya Kamada
gitlab-ce
Commits
0ff56434
Commit
0ff56434
authored
Jan 05, 2017
by
Annabel Dunstone Gray
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Keep max width on MR content on side by side view
parent
3b8c81fe
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
52 additions
and
3 deletions
+52
-3
app/assets/stylesheets/pages/issuable.scss
app/assets/stylesheets/pages/issuable.scss
+49
-0
app/views/projects/issues/show.html.haml
app/views/projects/issues/show.html.haml
+1
-1
app/views/projects/merge_requests/_show.html.haml
app/views/projects/merge_requests/_show.html.haml
+2
-2
No files found.
app/assets/stylesheets/pages/issuable.scss
View file @
0ff56434
// Limit MR description for side-by-side diff view
.fixed-width-container
{
max-width
:
$limited-layout-width
-
(
$gl-padding
*
2
);
margin-left
:
auto
;
margin-right
:
auto
;
}
.limit-container-width
{
.detail-page-header
{
@extend
.fixed-width-container
;
}
.issuable-details
{
.detail-page-description
,
.mr-source-target
,
.mr-state-widget
,
.merge-manually
{
@extend
.fixed-width-container
;
}
.merge-request-tabs-holder
{
&
.affix
{
border-bottom
:
1px
solid
$border-color
;
.nav-links
{
border
:
0
;
}
}
.container-fluid
{
@extend
.fixed-width-container
;
}
}
}
.merge-request-details
{
.emoji-list-container
{
@extend
.fixed-width-container
;
}
}
.diffs
{
.mr-version-controls
,
.files-changed
{
@extend
.fixed-width-container
;
}
}
}
.issuable-details
{
section
{
.issuable-discussion
{
...
...
app/views/projects/issues/show.html.haml
View file @
0ff56434
-
@content_class
=
"limit-container-width"
-
@content_class
=
"limit-container-width"
unless
fluid_layout
-
page_title
"
#{
@issue
.
title
}
(
#{
@issue
.
to_reference
}
)"
,
"Issues"
-
page_description
@issue
.
description
-
page_card_attributes
@issue
.
card_attributes
...
...
app/views/projects/merge_requests/_show.html.haml
View file @
0ff56434
-
@content_class
=
"limit-container-width"
-
@content_class
=
"limit-container-width"
unless
fluid_layout
-
page_title
"
#{
@merge_request
.
title
}
(
#{
@merge_request
.
to_reference
}
)"
,
"Merge Requests"
-
page_description
@merge_request
.
description
-
page_card_attributes
@merge_request
.
card_attributes
...
...
@@ -47,7 +47,7 @@
=
succeed
'.'
do
=
link_to
"command line"
,
"#modal_merge_info"
,
class:
"how_to_merge_link vlink"
,
title:
"How To Merge"
,
"data-toggle"
=>
"modal"
.content-block.content-block-small
.content-block.content-block-small
.emoji-list-container
=
render
'award_emoji/awards_block'
,
awardable:
@merge_request
,
inline:
true
-
if
@commits_count
.
nonzero?
...
...
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