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
62210cf5
Commit
62210cf5
authored
May 17, 2018
by
Clement Ho
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix terms spec
parent
fd5fdb2c
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
8 additions
and
8 deletions
+8
-8
app/assets/stylesheets/framework/header.scss
app/assets/stylesheets/framework/header.scss
+3
-3
app/views/layouts/header/_default.html.haml
app/views/layouts/header/_default.html.haml
+1
-1
app/views/layouts/header/_new_dropdown.haml
app/views/layouts/header/_new_dropdown.haml
+1
-1
app/views/layouts/terms.html.haml
app/views/layouts/terms.html.haml
+1
-1
qa/qa/page/menu/main.rb
qa/qa/page/menu/main.rb
+2
-2
No files found.
app/assets/stylesheets/framework/header.scss
View file @
62210cf5
...
@@ -325,8 +325,8 @@
...
@@ -325,8 +325,8 @@
fill
:
currentColor
;
fill
:
currentColor
;
}
}
.header-user
.dropdown-menu
-nav
,
.header-user
.dropdown-menu
,
.header-new
.dropdown-menu
-nav
{
.header-new
.dropdown-menu
{
margin-top
:
$dropdown-vertical-offset
;
margin-top
:
$dropdown-vertical-offset
;
}
}
...
@@ -515,7 +515,7 @@
...
@@ -515,7 +515,7 @@
}
}
.header-user
{
.header-user
{
.dropdown-menu
-nav
{
.dropdown-menu
{
width
:
auto
;
width
:
auto
;
min-width
:
160px
;
min-width
:
160px
;
margin-top
:
4px
;
margin-top
:
4px
;
...
...
app/views/layouts/header/_default.html.haml
View file @
62210cf5
...
@@ -52,7 +52,7 @@
...
@@ -52,7 +52,7 @@
=
link_to
current_user
,
class:
user_dropdown_class
,
data:
{
toggle:
"dropdown"
}
do
=
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"
=
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'
)
=
sprite_icon
(
'angle-down'
,
css_class:
'caret-down'
)
.dropdown-menu
-nav
.dropdown-menu-right
.dropdown-menu.dropdown-menu-right
=
render
'layouts/header/current_user_dropdown'
=
render
'layouts/header/current_user_dropdown'
-
if
header_link?
(
:admin_impersonation
)
-
if
header_link?
(
:admin_impersonation
)
%li
.nav-item.impersonation
%li
.nav-item.impersonation
...
...
app/views/layouts/header/_new_dropdown.haml
View file @
62210cf5
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
=
link_to
new_project_path
,
class:
"header-new-dropdown-toggle has-tooltip qa-new-menu-toggle"
,
title:
"New..."
,
ref:
'tooltip'
,
aria:
{
label:
"New..."
},
data:
{
toggle:
'dropdown'
,
placement:
'bottom'
,
container:
'body'
}
do
=
link_to
new_project_path
,
class:
"header-new-dropdown-toggle has-tooltip qa-new-menu-toggle"
,
title:
"New..."
,
ref:
'tooltip'
,
aria:
{
label:
"New..."
},
data:
{
toggle:
'dropdown'
,
placement:
'bottom'
,
container:
'body'
}
do
=
sprite_icon
(
'plus-square'
,
size:
16
)
=
sprite_icon
(
'plus-square'
,
size:
16
)
=
sprite_icon
(
'angle-down'
,
css_class:
'caret-down'
)
=
sprite_icon
(
'angle-down'
,
css_class:
'caret-down'
)
.dropdown-menu.dropdown-menu-
nav.dropdown-menu-
right
.dropdown-menu.dropdown-menu-right
%ul
%ul
-
if
@group
&
.
persisted?
-
if
@group
&
.
persisted?
-
create_group_project
=
can?
(
current_user
,
:create_projects
,
@group
)
-
create_group_project
=
can?
(
current_user
,
:create_projects
,
@group
)
...
...
app/views/layouts/terms.html.haml
View file @
62210cf5
...
@@ -29,6 +29,6 @@
...
@@ -29,6 +29,6 @@
=
link_to
current_user
,
class:
user_dropdown_class
,
data:
{
toggle:
"dropdown"
}
do
=
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"
=
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'
)
=
sprite_icon
(
'angle-down'
,
css_class:
'caret-down'
)
.dropdown-menu
-nav
.dropdown-menu-right
.dropdown-menu.dropdown-menu-right
=
render
'layouts/header/current_user_dropdown'
=
render
'layouts/header/current_user_dropdown'
=
yield
=
yield
qa/qa/page/menu/main.rb
View file @
62210cf5
...
@@ -10,7 +10,7 @@ module QA
...
@@ -10,7 +10,7 @@ module QA
view
'app/views/layouts/header/_default.html.haml'
do
view
'app/views/layouts/header/_default.html.haml'
do
element
:navbar
element
:navbar
element
:user_avatar
element
:user_avatar
element
:user_menu
,
'.dropdown-menu
-nav
'
element
:user_menu
,
'.dropdown-menu'
end
end
view
'app/views/layouts/nav/_dashboard.html.haml'
do
view
'app/views/layouts/nav/_dashboard.html.haml'
do
...
@@ -70,7 +70,7 @@ module QA
...
@@ -70,7 +70,7 @@ module QA
within_top_menu
do
within_top_menu
do
click_element
:user_avatar
click_element
:user_avatar
page
.
within
(
'.dropdown-menu
-nav
'
)
do
page
.
within
(
'.dropdown-menu'
)
do
yield
yield
end
end
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