diff --git a/app/assets/stylesheets/dm/components/_profile.scss b/app/assets/stylesheets/dm/components/_profile.scss index 441e6b60b..7a8e792a1 100644 --- a/app/assets/stylesheets/dm/components/_profile.scss +++ b/app/assets/stylesheets/dm/components/_profile.scss @@ -38,17 +38,6 @@ position: relative; } -.edit-profile-link { - @extend .usa-link; - text-decoration: none !important; - - .edit-profile-icon { - &:after { - text-decoration: none; - } - } -} - .cancel-edit-profile-link { &:hover { text-decoration: none !important; diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb index c0f3aedfa..44dc5d085 100644 --- a/app/views/users/show.html.erb +++ b/app/views/users/show.html.erb @@ -17,11 +17,6 @@

<%= @user.full_name %>

-
- <% if current_user == @user %> - <%= link_to '', edit_profile_path, class: 'edit-profile-link fas fa-edit display-inline-block text-no-underline' %> - <% end %> -
<%= @user.job_title %>
<% unless @user.location.blank? %>

@@ -47,6 +42,9 @@

<% end %> + <% if current_user == @user %> + <%= link_to 'Edit profile', edit_profile_path, class: 'usa-button usa-button--outline display-inline-block margin-top-2' %> + <% end %>
diff --git a/spec/features/users/user_profile_spec.rb b/spec/features/users/user_profile_spec.rb index b81d67bc0..7f416fab2 100644 --- a/spec/features/users/user_profile_spec.rb +++ b/spec/features/users/user_profile_spec.rb @@ -27,7 +27,7 @@ it 'should have edit profile button for logged in user' do login_as(@user, scope: :user, run_callbacks: false) visit "/users/#{@user.id}" - expect(page).to have_selector('.edit-profile-link') + expect(page).to have_content('Edit profile') end it 'if not logged in, should be redirected to landing page when accessing account edit' do