Remove stylelint warnings from events.scss59906-fix-the-following-style-lint-errors-and-warnings-for-app-assets-stylesheets-pages-events-scss

5 files changed, 10 insertions, 31 deletions

diff --git a/app/assets/stylesheets/framework/common.scss b/app/assets/stylesheets/framework/common.scss
index c3031c3375e..571bdcb3dd3 100644
--- a/app/assets/stylesheets/framework/common.scss
+++ b/app/assets/stylesheets/framework/common.scss
@@ -80,6 +80,10 @@
   overflow: visible;
 }
 
+.svg-fill-secondary {
+  fill: $gl-text-color-secondary;
+}
+
 pre {
   &.clean {
     background: none;
diff --git a/app/assets/stylesheets/pages/events.scss b/app/assets/stylesheets/pages/events.scss
index 618f23d81b1..f982e90cfcd 100644
--- a/app/assets/stylesheets/pages/events.scss
+++ b/app/assets/stylesheets/pages/events.scss
@@ -13,16 +13,6 @@
   .system-note-image {
     position: absolute;
     left: 0;
-
-    svg {
-      fill: $gl-text-color-secondary;
-    }
-  }
-
-  .system-note-image-inline {
-    svg {
-      fill: $gl-text-color-secondary;
-    }
   }
 
   .system-note-image,
@@ -50,7 +40,7 @@
   .event-user-info {
     margin-bottom: $gl-padding-8;
 
-    .author_name {
+    .author-name {
       a {
         color: $gl-text-color;
         font-weight: $gl-font-weight-bold;
@@ -118,26 +108,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 {
     border: 0;
   }
 
-  .event_commits {
+  .event-commits {
     li {
       &.commit {
         background: transparent;
diff --git a/app/helpers/events_helper.rb b/app/helpers/events_helper.rb
index 1371e9993b4..72c0693cc62 100644
--- a/app/helpers/events_helper.rb
+++ b/app/helpers/events_helper.rb
@@ -209,7 +209,7 @@ module EventsHelper
 
   def inline_event_icon(event)
     unless current_path?('users#show')
-      content_tag :span, class: "system-note-image-inline d-none d-sm-flex append-right-4 #{event.action_name.parameterize}-icon align-self-center" do
+      content_tag :span, class: "svg-fill-secondary d-none d-sm-flex append-right-4 #{event.action_name.parameterize}-icon align-self-center" do
         icon_for_event(event.action_name, size: 14)
       end
     end
@@ -217,7 +217,7 @@ module EventsHelper
 
   def event_user_info(event)
     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 content_tag(:span, event.author.to_reference, class: "username")
     end
diff --git a/app/views/events/event/_private.html.haml b/app/views/events/event/_private.html.haml
index d91f30c07cb..8d139999aa5 100644
--- a/app/views/events/event/_private.html.haml
+++ b/app/views/events/event/_private.html.haml
@@ -2,7 +2,7 @@
   .event-item-timestamp
     = time_ago_with_tooltip(event.created_at)
 
-  .system-note-image= sprite_icon('eye-slash', size: 24, css_class: 'icon')
+  .system-note-image= sprite_icon('eye-slash', size: 24, css_class: 'icon svg-fill-secondary')
 
   = event_user_info(event)
 
diff --git a/app/views/events/event/_push.html.haml b/app/views/events/event/_push.html.haml
index 69914fccc48..4dce9121df7 100644
--- a/app/views/events/event/_push.html.haml
+++ b/app/views/events/event/_push.html.haml
@@ -16,7 +16,7 @@
 
 - if event.push_with_commits?
   .event-body
-    %ul.content-list.event_commits
+    %ul.content-list.event-commits
       = render "events/commit", project: project, event: event
 
       - create_mr = event.new_ref? && create_mr_button?(project.default_branch, event.ref_name, project) && event.authored_by?(current_user)