kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

fix terms spec

This commit is contained in:
Clement Ho 2018-05-17 16:50:13 -04:00
parent fd5fdb2c1a
commit 62210cf5f5
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/assets/stylesheets/framework/header.scss
View File

@ -325,8 +325,8 @@
fill: currentColor;
}
.header-user .dropdown-menu-nav,
.header-new .dropdown-menu-nav {
.header-user .dropdown-menu,
.header-new .dropdown-menu {
margin-top: $dropdown-vertical-offset;
}
@ -515,7 +515,7 @@
}
.header-user {
.dropdown-menu-nav {
.dropdown-menu {
width: auto;
min-width: 160px;
margin-top: 4px;

2
app/views/layouts/header/_default.html.haml
View File

@ -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-right
.dropdown-menu.dropdown-menu-right
= render 'layouts/header/current_user_dropdown'
- if header_link?(:admin_impersonation)
%li.nav-item.impersonation

2
app/views/layouts/header/_new_dropdown.haml
View File

@ -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
= sprite_icon('plus-square', size: 16)
= sprite_icon('angle-down', css_class: 'caret-down')
.dropdown-menu.dropdown-menu-nav.dropdown-menu-right
.dropdown-menu.dropdown-menu-right
%ul
- if @group&.persisted?
- create_group_project = can?(current_user, :create_projects, @group)

2
app/views/layouts/terms.html.haml
View File

@ -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-right
.dropdown-menu.dropdown-menu-right
= render 'layouts/header/current_user_dropdown'
= yield

4
qa/qa/page/menu/main.rb
View File

@ -10,7 +10,7 @@ module QA
view 'app/views/layouts/header/_default.html.haml' do
element :navbar
element :user_avatar
element :user_menu, '.dropdown-menu-nav'
element :user_menu, '.dropdown-menu'
end
view 'app/views/layouts/nav/_dashboard.html.haml' do
@ -70,7 +70,7 @@ module QA
within_top_menu do
click_element :user_avatar
page.within('.dropdown-menu-nav') do
page.within('.dropdown-menu') do
yield
end
end