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
24d2e662
Commit
24d2e662
authored
8 years ago
by
tauriedavis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Limit description container for mrs while viewing side by side diff
parent
258ab294
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
44 additions
and
17 deletions
+44
-17
app/assets/stylesheets/framework/variables.scss
app/assets/stylesheets/framework/variables.scss
+1
-2
app/assets/stylesheets/pages/issuable.scss
app/assets/stylesheets/pages/issuable.scss
+42
-10
app/assets/stylesheets/pages/notes.scss
app/assets/stylesheets/pages/notes.scss
+0
-4
app/views/projects/merge_requests/_show.html.haml
app/views/projects/merge_requests/_show.html.haml
+1
-1
No files found.
app/assets/stylesheets/framework/variables.scss
View file @
24d2e662
...
...
@@ -166,8 +166,7 @@ $row-hover-border: #b2d7ff;
$progress-color
:
#c0392b
;
$header-height
:
50px
;
$fixed-layout-width
:
1280px
;
$limited-layout-width
:
958px
;
$line-length-width
:
700px
;
$limited-layout-width
:
990px
;
$gl-avatar-size
:
40px
;
$error-exclamation-point
:
#e62958
;
$border-radius-default
:
2px
;
...
...
This diff is collapsed.
Click to expand it.
app/assets/stylesheets/pages/issuable.scss
View file @
24d2e662
.container-limited.limit-container-width
{
.issue-details
{
.description
,
.note-body
{
p
,
ul
,
ol
,
.code
{
max-width
:
$line-length-width
;
// Limit MR description for side-by-side diff view
.limit-container-width
{
.detail-page-header
{
max-width
:
calc
(
#{
$limited-layout-width
}
-
(
#{
$gl-padding
}
*
2
));
margin-left
:
auto
;
margin-right
:
auto
;
}
.issuable-details
{
.detail-page-description
,
.mr-source-target
,
.mr-state-widget
,
.merge-manually
{
max-width
:
calc
(
#{
$limited-layout-width
}
-
(
#{
$gl-padding
}
*
2
));
margin-left
:
auto
;
margin-right
:
auto
;
}
.merge-request-tabs-holder
{
&
.affix
{
border-bottom
:
1px
solid
$border-color
;
.nav-links
{
border
:
0
;
}
}
.container-fluid
{
padding-left
:
0
;
padding-right
:
0
;
max-width
:
calc
(
#{
$limited-layout-width
}
-
(
#{
$gl-padding
}
*
2
));
margin-left
:
auto
;
margin-right
:
auto
;
}
}
}
.diffs
{
.mr-version-controls
,
.files-changed
{
max-width
:
calc
(
#{
$limited-layout-width
}
-
(
#{
$gl-padding
}
*
2
));
margin-left
:
auto
;
margin-right
:
auto
;
}
}
}
.issuable-details
{
...
...
@@ -23,7 +56,6 @@
.description
img
:not
(
.emoji
)
{
border
:
1px
solid
$table-border-gray
;
padding
:
5px
;
margin
:
5px
;
max-height
:
calc
(
100vh
-
100px
);
}
}
...
...
This diff is collapsed.
Click to expand it.
app/assets/stylesheets/pages/notes.scss
View file @
24d2e662
...
...
@@ -383,10 +383,6 @@ ul.notes {
.note-action-button
{
margin-left
:
10px
;
}
@media
(
min-width
:
$screen-sm-min
)
{
position
:
relative
;
}
}
.discussion-actions
{
...
...
This diff is collapsed.
Click to expand it.
app/views/projects/merge_requests/_show.html.haml
View file @
24d2e662
...
...
@@ -42,7 +42,7 @@
=
render
"projects/merge_requests/widget/show.html.haml"
-
if
@merge_request
.
source_branch_exists?
&&
@merge_request
.
mergeable?
&&
@merge_request
.
can_be_merged_by?
(
current_user
)
.light.prepend-top-default.append-bottom-default
.
merge-manually.
light.prepend-top-default.append-bottom-default
You can also accept this merge request manually using the
=
succeed
'.'
do
=
link_to
"command line"
,
"#modal_merge_info"
,
class:
"how_to_merge_link vlink"
,
title:
"How To Merge"
,
"data-toggle"
=>
"modal"
...
...
This diff is collapsed.
Click to expand it.
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