BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
61902165
Commit
61902165
authored
Jul 27, 2016
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add small visual improvements to merge request version switch
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
dbd58dc4
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
4 deletions
+11
-4
merge_requests.scss
app/assets/stylesheets/pages/merge_requests.scss
+5
-1
_versions.html.haml
app/views/projects/merge_requests/show/_versions.html.haml
+6
-3
No files found.
app/assets/stylesheets/pages/merge_requests.scss
View file @
61902165
...
@@ -375,5 +375,9 @@
...
@@ -375,5 +375,9 @@
.mr-version-switch
{
.mr-version-switch
{
background
:
$background-color
;
background
:
$background-color
;
padding
:
$gl-btn-padding
;
padding
:
$gl-btn-padding
;
border-bottom
:
1px
solid
$border-color
;
color
:
$gl-placeholder-color
;
a
.btn-link
{
color
:
$gl-dark-link-color
;
}
}
}
app/views/projects/merge_requests/show/_versions.html.haml
View file @
61902165
...
@@ -10,15 +10,18 @@
...
@@ -10,15 +10,18 @@
-
if
latest_diff
==
@merge_request_diff
-
if
latest_diff
==
@merge_request_diff
#{
"latest"
}
#{
"latest"
}
-
else
-
else
#{
@merge_request_diff
.
base_commit
.
short_id
}
..
#{
@merge_request_diff
.
head_commit
.
short_id
}
#{
@merge_request_diff
.
head_commit
.
short_id
}
%span
.caret
%span
.caret
%ul
.dropdown-menu.dropdown-menu-selectable
%ul
.dropdown-menu.dropdown-menu-selectable
-
@merge_request
.
merge_request_diffs
.
each
do
|
merge_request_diff
|
-
@merge_request
.
merge_request_diffs
.
each
do
|
merge_request_diff
|
%li
%li
=
link_to
diffs_namespace_project_merge_request_path
(
@project
.
namespace
,
@project
,
@merge_request
,
diff_id:
merge_request_diff
.
id
),
class:
(
'is-active'
if
merge_request_diff
==
@merge_request_diff
)
do
=
link_to
diffs_namespace_project_merge_request_path
(
@project
.
namespace
,
@project
,
@merge_request
,
diff_id:
merge_request_diff
.
id
),
class:
(
'is-active'
if
merge_request_diff
==
@merge_request_diff
)
do
%strong
.monospace
%strong
.monospace
#{
merge_request_diff
.
base_commit
.
short_id
}
..
#{
merge_request_diff
.
head_commit
.
short_id
}
#{
merge_request_diff
.
head_commit
.
short_id
}
%br
%br
%small
%small
=
time_ago_with_tooltip
(
merge_request_diff
.
created_at
)
=
time_ago_with_tooltip
(
merge_request_diff
.
created_at
)
.pull-right
%span
.monospace
git
diff
#{
@merge_request_diff
.
base_commit
.
short_id
}
..
#{
@merge_request_diff
.
head_commit
.
short_id
}
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