Merge branch 'next-minor' into develop

Changelog.md

@@ -18,6 +18,7 @@
 * Unify link colors [#7318](https://github.com/diaspora/diaspora/pull/7318)
 * Increase time to wait before showing the hovercard [#7319](https://github.com/diaspora/diaspora/pull/7319)
 * Remove some unused color-theme overrides [#7325](https://github.com/diaspora/diaspora/pull/7325)
+* Change color of author-name on hover [#7326](https://github.com/diaspora/diaspora/pull/7326)
 
 ## Bug fixes
 * Fix path to `bundle` in `script/server` [#7281](https://github.com/diaspora/diaspora/pull/7281)

app/assets/stylesheets/base.scss

@@ -60,10 +60,6 @@ pre { word-wrap: break-word; }
   }
 }
 
-.author-name {
-  color: inherit;
-}
-
 .back-to-top {
   background-color: $border-dark-grey;
   border-radius: 4px;

app/assets/stylesheets/color_themes/_color_theme_override_dark.scss

@@ -50,7 +50,7 @@ body {
   @import 'highlightjs/darcula';
 
   #single-post-content .head {
-    #post-info .author { color: lighten($gray-lighter, 27%); }
+    .author-name { color: lighten($gray-lighter, 27%); }
     #single-post-actions i.entypo-heart.red:hover { color: $red; }
   }
 

app/assets/stylesheets/hovercard.scss

@@ -53,7 +53,6 @@
     padding-bottom: 0px;
     font-size: 16px;
     a {
-      color: $link-color;
       font-weight: bold !important;
     }
   }

app/assets/stylesheets/single-post-view.scss

@@ -7,7 +7,6 @@
     border-bottom: 1px solid $border-grey;
     padding: 10px 0;
     #post-info {
-      .author{ color: $grey; }
       .info {
         color: lighten($text-grey,10%);
         font-size: 12px;
@@ -22,6 +21,9 @@
         padding-left: 10px;
       }
     }
+
+    .author-name { color: $grey; }
+
     .near-from {
       color: $text-grey;
       font-size: 12px;

app/assets/stylesheets/stream_element.scss

@@ -90,7 +90,6 @@
       font-weight: bold;
       margin-bottom: 4px;
     }
-    a.author-name { color: $link-color; }
     .feedback {
       margin-top: 5px;
       font-size: $font-size-small;