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
Kazuhiko Shiozaki
gitlab-ce
Commits
c5ec2a23
Commit
c5ec2a23
authored
Nov 06, 2015
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Small UI improvements to merge request page
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
95da91a6
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
12 additions
and
5 deletions
+12
-5
app/assets/stylesheets/framework/blocks.scss
app/assets/stylesheets/framework/blocks.scss
+4
-0
app/assets/stylesheets/pages/diff.scss
app/assets/stylesheets/pages/diff.scss
+0
-1
app/helpers/diff_helper.rb
app/helpers/diff_helper.rb
+2
-2
app/views/projects/diffs/_diffs.html.haml
app/views/projects/diffs/_diffs.html.haml
+1
-1
app/views/projects/merge_requests/_discussion.html.haml
app/views/projects/merge_requests/_discussion.html.haml
+1
-1
app/views/projects/merge_requests/show/_commits.html.haml
app/views/projects/merge_requests/show/_commits.html.haml
+4
-0
No files found.
app/assets/stylesheets/framework/blocks.scss
View file @
c5ec2a23
...
@@ -28,6 +28,10 @@
...
@@ -28,6 +28,10 @@
border-bottom
:
1px
solid
$border-color
;
border-bottom
:
1px
solid
$border-color
;
color
:
$gl-gray
;
color
:
$gl-gray
;
&
.oneline-block
{
line-height
:
42px
;
}
&
.white
{
&
.white
{
background-color
:
white
;
background-color
:
white
;
}
}
...
...
app/assets/stylesheets/pages/diff.scss
View file @
c5ec2a23
...
@@ -367,7 +367,6 @@
...
@@ -367,7 +367,6 @@
.inline-parallel-buttons
{
.inline-parallel-buttons
{
float
:
right
;
float
:
right
;
margin-top
:
-5px
;
}
}
// Mobile
// Mobile
...
...
app/helpers/diff_helper.rb
View file @
c5ec2a23
...
@@ -137,7 +137,7 @@ module DiffHelper
...
@@ -137,7 +137,7 @@ module DiffHelper
# Always use HTML to handle case where JSON diff rendered this button
# Always use HTML to handle case where JSON diff rendered this button
params_copy
.
delete
(
:format
)
params_copy
.
delete
(
:format
)
link_to
url_for
(
params_copy
),
id:
"inline-diff-btn"
,
class:
(
params
[
:view
]
!=
'parallel'
?
'btn
btn-sm active'
:
'btn btn-sm
'
)
do
link_to
url_for
(
params_copy
),
id:
"inline-diff-btn"
,
class:
(
params
[
:view
]
!=
'parallel'
?
'btn
active'
:
'btn
'
)
do
'Inline'
'Inline'
end
end
end
end
...
@@ -148,7 +148,7 @@ module DiffHelper
...
@@ -148,7 +148,7 @@ module DiffHelper
# Always use HTML to handle case where JSON diff rendered this button
# Always use HTML to handle case where JSON diff rendered this button
params_copy
.
delete
(
:format
)
params_copy
.
delete
(
:format
)
link_to
url_for
(
params_copy
),
id:
"parallel-diff-btn"
,
class:
(
params
[
:view
]
==
'parallel'
?
'btn active
btn-sm'
:
'btn btn-sm
'
)
do
link_to
url_for
(
params_copy
),
id:
"parallel-diff-btn"
,
class:
(
params
[
:view
]
==
'parallel'
?
'btn active
'
:
'btn
'
)
do
'Side-by-side'
'Side-by-side'
end
end
end
end
...
...
app/views/projects/diffs/_diffs.html.haml
View file @
c5ec2a23
...
@@ -3,7 +3,7 @@
...
@@ -3,7 +3,7 @@
-
diff_files
=
safe_diff_files
(
diffs
)
-
diff_files
=
safe_diff_files
(
diffs
)
.gray-content-block.second-block
.gray-content-block.second-block
.oneline-block
.inline-parallel-buttons
.inline-parallel-buttons
.btn-group
.btn-group
=
inline_diff_btn
=
inline_diff_btn
...
...
app/views/projects/merge_requests/_discussion.html.haml
View file @
c5ec2a23
...
@@ -7,7 +7,7 @@
...
@@ -7,7 +7,7 @@
=
render
'shared/show_aside'
=
render
'shared/show_aside'
.gray-content-block.second-block
.gray-content-block.second-block
.oneline-block
.row
.row
.col-md-9
.col-md-9
.votes-holder.pull-right
.votes-holder.pull-right
...
...
app/views/projects/merge_requests/show/_commits.html.haml
View file @
c5ec2a23
.gray-content-block.second-block.oneline-block
=
icon
(
"sort-amount-desc"
)
Most recent commits displayed first
=
render
"projects/commits/commits"
,
project:
@merge_request
.
project
=
render
"projects/commits/commits"
,
project:
@merge_request
.
project
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