Commit e4e824c1 authored by George Tsiolis's avatar George Tsiolis

Replace author_link snake case in stylesheets, specs, and helpers

parent f1c7ab51
...@@ -270,7 +270,7 @@ ul.controls { ...@@ -270,7 +270,7 @@ ul.controls {
.issuable-pipeline-broken a, .issuable-pipeline-broken a,
.issuable-pipeline-status a, .issuable-pipeline-status a,
.author_link { .author-link {
display: flex; display: flex;
} }
} }
......
...@@ -486,7 +486,7 @@ ...@@ -486,7 +486,7 @@
padding-bottom: 0; padding-bottom: 0;
margin-bottom: 10px; margin-bottom: 10px;
.author_link { .author-link {
padding-left: 0; padding-left: 0;
.avatar { .avatar {
...@@ -595,7 +595,7 @@ ...@@ -595,7 +595,7 @@
margin: 16px 0 0; margin: 16px 0 0;
font-size: 85%; font-size: 85%;
.author_link { .author-link {
color: $gray-darkest; color: $gray-darkest;
} }
} }
...@@ -620,7 +620,7 @@ ...@@ -620,7 +620,7 @@
padding-right: 0; padding-right: 0;
} }
.author_link { .author-link {
display: block; display: block;
} }
......
...@@ -63,10 +63,10 @@ module ProjectsHelper ...@@ -63,10 +63,10 @@ module ProjectsHelper
author_html = author_html.html_safe author_html = author_html.html_safe
if opts[:name] if opts[:name]
link_to(author_html, user_path(author), class: "author_link #{"#{opts[:extra_class]}" if opts[:extra_class]} #{"#{opts[:mobile_classes]}" if opts[:mobile_classes]}").html_safe link_to(author_html, user_path(author), class: "author-link #{"#{opts[:extra_class]}" if opts[:extra_class]} #{"#{opts[:mobile_classes]}" if opts[:mobile_classes]}").html_safe
else else
title = opts[:title].sub(":name", sanitize(author.name)) title = opts[:title].sub(":name", sanitize(author.name))
link_to(author_html, user_path(author), class: "author_link has-tooltip", title: title, data: { container: 'body' }).html_safe link_to(author_html, user_path(author), class: "author-link has-tooltip", title: title, data: { container: 'body' }).html_safe
end end
end end
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
.flash-container.timeline-content .flash-container.timeline-content
.timeline-icon.d-none.d-sm-none.d-md-block .timeline-icon.d-none.d-sm-none.d-md-block
%a.author_link{ href: user_path(current_user) } %a.author-link{ href: user_path(current_user) }
= image_tag avatar_icon_for_user(current_user), alt: current_user.to_reference, class: 'avatar s40' = image_tag avatar_icon_for_user(current_user), alt: current_user.to_reference, class: 'avatar s40'
.timeline-content.timeline-content-form .timeline-content.timeline-content-form
= render "shared/notes/form", view: diff_view, supports_autocomplete: autocomplete = render "shared/notes/form", view: diff_view, supports_autocomplete: autocomplete
......
---
title: Replace author_link snake case in stylesheets, specs, and helpers
merge_request: 20797
author: George Tsiolis
type: other
...@@ -63,7 +63,7 @@ describe 'Multiple issue updating from issues#index', :js do ...@@ -63,7 +63,7 @@ describe 'Multiple issue updating from issues#index', :js do
click_link 'Unassigned' click_link 'Unassigned'
click_update_issues_button click_update_issues_button
expect(find('.issue:first-child .controls')).not_to have_css('.author_link') expect(find('.issue:first-child .controls')).not_to have_css('.author-link')
end end
end end
......
...@@ -62,7 +62,7 @@ describe 'Merge requests > User mass updates', :js do ...@@ -62,7 +62,7 @@ describe 'Merge requests > User mass updates', :js do
it 'removes assignee from the merge request' do it 'removes assignee from the merge request' do
change_assignee('Unassigned') change_assignee('Unassigned')
expect(find('.merge-request .controls')).not_to have_css('.author_link') expect(find('.merge-request .controls')).not_to have_css('.author-link')
end end
end end
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment