Skip to content
Snippets Groups Projects
Commit 3b2adb5b authored by Dimitrie Hoekstra's avatar Dimitrie Hoekstra Committed by Annabel Dunstone Gray
Browse files

Added profile name to user dropdown

parent 364050c1
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -40,6 +40,10 @@
line-height: 24px;
}
 
.bold {
font-weight: 600;
}
.tab-content {
overflow: visible;
}
Loading
Loading
Loading
Loading
@@ -331,6 +331,14 @@ header {
.dropdown-menu-nav {
min-width: 140px;
margin-top: -5px;
.current-user {
padding: 5px 18px;
.user-name {
display: block;
}
}
}
}
 
Loading
Loading
Loading
Loading
@@ -210,10 +210,6 @@
}
}
 
.bold {
font-weight: 600;
}
.light {
font-weight: normal;
}
Loading
Loading
Loading
Loading
@@ -67,6 +67,11 @@
= icon('caret-down')
.dropdown-menu-nav.dropdown-menu-align-right
%ul
%li.current-user
.user-name.bold
= current_user.name
@#{current_user.username}
%li.divider
%li
= link_to "Profile", current_user, class: 'profile-link', aria: { label: "Profile" }, data: { user: current_user.username }
%li
Loading
Loading
---
title: Added profile name to user dropdown
merge_request:
author:
Loading
Loading
@@ -87,7 +87,7 @@ class Spinach::Features::GroupMembers < Spinach::FeatureSteps
end
 
step 'I click on the "Remove User From Group" button for "John Doe"' do
find(:css, 'li', text: "John Doe").find(:css, 'a.btn-remove').click
find(:css, '.project-members-page li', text: "John Doe").find(:css, 'a.btn-remove').click
# poltergeist always confirms popups.
end
 
Loading
Loading
@@ -97,7 +97,7 @@ class Spinach::Features::GroupMembers < Spinach::FeatureSteps
end
 
step 'I should not see the "Remove User From Group" button for "John Doe"' do
expect(find(:css, 'li', text: "John Doe")).not_to have_selector(:css, 'a.btn-remove')
expect(find(:css, '.project-members-page li', text: "John Doe")).not_to have_selector(:css, 'a.btn-remove')
# poltergeist always confirms popups.
end
 
Loading
Loading
Loading
Loading
@@ -109,7 +109,7 @@ describe "Admin::Projects", feature: true do
expect(page).to have_content('Developer')
end
 
find(:css, 'li', text: current_user.name).find(:css, 'a.btn-remove').click
find(:css, '.content-list li', text: current_user.name).find(:css, 'a.btn-remove').click
 
expect(page).not_to have_selector(:css, '.content-list')
end
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment