Merge remote-tracking branch 'upstream/pull/4268'

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index dd07ffd214000278186453a541049ef153e19174..6ff46c07ce5be5304b8d42d0cfc777bef7974b85 100644 (file)
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -729,14 +729,6 @@ tr.turn:hover {
     }
   }
 
-  .comments {
-    color: $darkgrey;
-  }
-
-  .comments-0 {
-    opacity: 0.5;
-  }
-
   .changeset_more .loader {
     display: none;
     width: 100%;

diff --git a/app/views/changesets/_changeset.html.erb b/app/views/changesets/_changeset.html.erb
index a59c85ec4ba18632e8d9a27dcfd4c0a1606d406d..a4357a3f5ae677e1a7a22f822d32f8574e0dd469 100644 (file)
--- a/app/views/changesets/_changeset.html.erb
+++ b/app/views/changesets/_changeset.html.erb
@@ -24,7 +24,7 @@
         #<%= changeset.id %>
       </a>
     </div>
-    <div class="col-auto comments comments-<%= changeset.comments.length %>">
+    <div class="col-auto text-secondary<%= " opacity-50" if changeset.comments.empty? %>">
       <%= changeset.comments.length %>
       <span class="icon note grey"></span>
     </div>