Commit 35bd91b7 authored by Savas Vedova's avatar Savas Vedova

Merge branch...

Merge branch '27781-fix-the-following-style-lint-errors-and-warnings-for-app-assets-stylesheets-pages-events-scss' into 'master'

Fix selectors with hyphens instead of underscores

See merge request gitlab-org/gitlab!56521
parents 0edaf646 c1d27f86
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
.event-user-info { .event-user-info {
margin-bottom: $gl-padding-4; margin-bottom: $gl-padding-4;
.author_name { .author-name {
a { a {
color: $gl-text-color; color: $gl-text-color;
font-weight: $gl-font-weight-bold; font-weight: $gl-font-weight-bold;
...@@ -118,26 +118,11 @@ ...@@ -118,26 +118,11 @@
} }
} }
.event_icon {
position: relative;
float: right;
border: 1px solid $gray-darker;
padding: 5px;
border-radius: 5px;
background: $gray-light;
margin-left: 10px;
top: -6px;
img {
width: 20px;
}
}
&:last-child { &:last-child {
border: 0; border: 0;
} }
.event_commits { .event-commits {
li { li {
&.commit { &.commit {
background: transparent; background: transparent;
......
...@@ -273,7 +273,7 @@ module EventsHelper ...@@ -273,7 +273,7 @@ module EventsHelper
def event_user_info(event) def event_user_info(event)
content_tag(:div, class: "event-user-info") do content_tag(:div, class: "event-user-info") do
concat content_tag(:span, link_to_author(event), class: "author_name") concat content_tag(:span, link_to_author(event), class: "author-name")
concat " ".html_safe concat " ".html_safe
concat content_tag(:span, event.author.to_reference, class: "username") concat content_tag(:span, event.author.to_reference, class: "username")
end end
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
- if event.push_with_commits? - if event.push_with_commits?
.event-body .event-body
%ul.content-list.event_commits %ul.content-list.event-commits
= render "events/commit", project: project, event: event = render "events/commit", project: project, event: event
- create_mr = event.new_ref? && create_mr_button?(from: project.default_branch, to: event.ref_name, source_project: project, target_project: project) && event.authored_by?(current_user) - create_mr = event.new_ref? && create_mr_button?(from: project.default_branch, to: event.ref_name, source_project: project, target_project: project) && event.authored_by?(current_user)
......
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