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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
983a8248
Commit
983a8248
authored
Oct 24, 2019
by
Jeremy Elder
Committed by
Filipa Lacerda
Oct 24, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Resolve "Dropdown icon missing on Compare page"
parent
1f5b91d6
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
4 deletions
+11
-4
app/views/projects/compare/_form.html.haml
app/views/projects/compare/_form.html.haml
+6
-4
changelogs/unreleased/28336-dropdown-icon-missing-on-compare-page.yml
...nreleased/28336-dropdown-icon-missing-on-compare-page.yml
+5
-0
No files found.
app/views/projects/compare/_form.html.haml
View file @
983a8248
...
...
@@ -8,8 +8,9 @@
.input-group-text
=
s_
(
"CompareBranches|Source"
)
=
hidden_field_tag
:to
,
params
[
:to
]
=
button_tag
type:
'button'
,
title:
params
[
:to
],
class:
"form-control compare-dropdown-toggle js-compare-dropdown has-tooltip monospace"
,
required:
true
,
data:
{
refs_url:
refs_project_path
(
@project
),
toggle:
"dropdown"
,
target:
".js-compare-to-dropdown"
,
selected:
params
[
:to
],
field_name: :to
}
do
.dropdown-toggle-text.str-truncated
=
params
[
:to
]
||
_
(
"Select branch/tag"
)
=
button_tag
type:
'button'
,
title:
params
[
:to
],
class:
"btn form-control compare-dropdown-toggle js-compare-dropdown has-tooltip"
,
required:
true
,
data:
{
refs_url:
refs_project_path
(
@project
),
toggle:
"dropdown"
,
target:
".js-compare-to-dropdown"
,
selected:
params
[
:to
],
field_name: :to
}
do
.dropdown-toggle-text.str-truncated.monospace.float-left
=
params
[
:to
]
||
_
(
"Select branch/tag"
)
=
sprite_icon
(
'arrow-down'
,
size:
16
,
css_class:
'float-right'
)
=
render
'shared/ref_dropdown'
.compare-ellipsis.inline
...
.form-group.dropdown.compare-form-group.from.js-compare-from-dropdown
...
...
@@ -18,8 +19,9 @@
.input-group-text
=
s_
(
"CompareBranches|Target"
)
=
hidden_field_tag
:from
,
params
[
:from
]
=
button_tag
type:
'button'
,
title:
params
[
:from
],
class:
"form-control compare-dropdown-toggle js-compare-dropdown has-tooltip monospace"
,
required:
true
,
data:
{
refs_url:
refs_project_path
(
@project
),
toggle:
"dropdown"
,
target:
".js-compare-from-dropdown"
,
selected:
params
[
:from
],
field_name: :from
}
do
.dropdown-toggle-text.str-truncated
=
params
[
:from
]
||
_
(
"Select branch/tag"
)
=
button_tag
type:
'button'
,
title:
params
[
:from
],
class:
"btn form-control compare-dropdown-toggle js-compare-dropdown has-tooltip"
,
required:
true
,
data:
{
refs_url:
refs_project_path
(
@project
),
toggle:
"dropdown"
,
target:
".js-compare-from-dropdown"
,
selected:
params
[
:from
],
field_name: :from
}
do
.dropdown-toggle-text.str-truncated.monospace.float-left
=
params
[
:from
]
||
_
(
"Select branch/tag"
)
=
sprite_icon
(
'arrow-down'
,
size:
16
,
css_class:
'float-right'
)
=
render
'shared/ref_dropdown'
=
button_tag
s_
(
"CompareBranches|Compare"
),
class:
"btn btn-success commits-compare-btn"
...
...
changelogs/unreleased/28336-dropdown-icon-missing-on-compare-page.yml
0 → 100644
View file @
983a8248
---
title
:
Adding dropdown arrow icon and updated text alignment
merge_request
:
author
:
type
:
other
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