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
Jérome Perrin
gitlab-ce
Commits
336b50d0
Commit
336b50d0
authored
May 08, 2018
by
Annabel Dunstone Gray
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix right-aligned menus; only display tooltip on hover
parent
5955caed
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
5 additions
and
4 deletions
+5
-4
app/assets/javascripts/main.js
app/assets/javascripts/main.js
+1
-0
app/views/layouts/header/_default.html.haml
app/views/layouts/header/_default.html.haml
+1
-1
app/views/layouts/terms.html.haml
app/views/layouts/terms.html.haml
+1
-1
app/views/shared/_ref_switcher.html.haml
app/views/shared/_ref_switcher.html.haml
+1
-1
spec/support/helpers/sorting_helper.rb
spec/support/helpers/sorting_helper.rb
+1
-1
No files found.
app/assets/javascripts/main.js
View file @
336b50d0
...
...
@@ -143,6 +143,7 @@ document.addEventListener('DOMContentLoaded', () => {
// Initialize tooltips
$body
.
tooltip
({
selector
:
'
.has-tooltip, [data-toggle="tooltip"]
'
,
trigger
:
'
hover
'
,
placement
(
tip
,
el
)
{
return
$
(
el
).
data
(
'
placement
'
)
||
'
bottom
'
;
},
...
...
app/views/layouts/header/_default.html.haml
View file @
336b50d0
...
...
@@ -52,7 +52,7 @@
=
link_to
current_user
,
class:
user_dropdown_class
,
data:
{
toggle:
"dropdown"
}
do
=
image_tag
avatar_icon_for_user
(
current_user
,
23
),
width:
23
,
height:
23
,
class:
"header-user-avatar qa-user-avatar"
=
sprite_icon
(
'angle-down'
,
css_class:
'caret-down'
)
.dropdown-menu-nav.dropdown-menu-
align-
right
.dropdown-menu-nav.dropdown-menu-right
=
render
'layouts/header/current_user_dropdown'
-
if
header_link?
(
:admin_impersonation
)
%li
.nav-item.impersonation
...
...
app/views/layouts/terms.html.haml
View file @
336b50d0
...
...
@@ -29,6 +29,6 @@
=
link_to
current_user
,
class:
user_dropdown_class
,
data:
{
toggle:
"dropdown"
}
do
=
image_tag
avatar_icon_for_user
(
current_user
,
23
),
width:
23
,
height:
23
,
class:
"header-user-avatar qa-user-avatar"
=
sprite_icon
(
'angle-down'
,
css_class:
'caret-down'
)
.dropdown-menu-nav.dropdown-menu-
align-
right
.dropdown-menu-nav.dropdown-menu-right
=
render
'layouts/header/current_user_dropdown'
=
yield
app/views/shared/_ref_switcher.html.haml
View file @
336b50d0
...
...
@@ -9,7 +9,7 @@
=
hidden_field_tag
key
,
value
,
id:
nil
.dropdown
=
dropdown_toggle
dropdown_toggle_text
,
{
toggle:
"dropdown"
,
selected:
dropdown_toggle_text
,
ref:
@ref
,
refs_url:
refs_project_path
(
@project
,
sort:
'updated_desc'
),
field_name:
'ref'
,
submit_form_on_click:
true
,
visit:
true
},
{
toggle_class:
"js-project-refs-dropdown qa-branches-select"
}
.dropdown-menu.dropdown-menu-selectable.git-revision-dropdown.dropdown-menu-paging.qa-branches-dropdown
{
class:
(
"dropdown-menu-
align-
right"
if
local_assigns
[
:align_right
])
}
.dropdown-menu.dropdown-menu-selectable.git-revision-dropdown.dropdown-menu-paging.qa-branches-dropdown
{
class:
(
"dropdown-menu-right"
if
local_assigns
[
:align_right
])
}
.dropdown-page-one
=
dropdown_title
_
(
"Switch branch/tag"
)
=
dropdown_filter
_
(
"Search branches and tags"
)
...
...
spec/support/helpers/sorting_helper.rb
View file @
336b50d0
...
...
@@ -11,7 +11,7 @@
module
SortingHelper
def
sorting_by
(
value
)
find
(
'button.dropdown-toggle'
).
click
page
.
within
(
'.content ul.dropdown-menu.dropdown-menu-
align-
right li'
)
do
page
.
within
(
'.content ul.dropdown-menu.dropdown-menu-right li'
)
do
click_link
value
end
end
...
...
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