Merge pull request #4529 from Flaburgan/fix-timeago-color

Change .timeago color and align notification, fix #4502

Changelog.md

@@ -21,6 +21,7 @@
 * Do not pull the 404 pages assets from Amazon S3 [#4501](https://github.com/diaspora/diaspora/pull/4501)
 * Fix counter background does not cover more than 2 digits on profile [#4499](https://github.com/diaspora/diaspora/issues/4499)
 * Fix commenting upon submission fail [#4005] (https://github.com/diaspora/diaspora/issues/4005)
+* Fix date color and alignment in the notifications dropdown [#4502](https://github.com/diaspora/diaspora/issues/4502)
 
 * Add a white background to images shown in the lightbox [#4475](https://github.com/diaspora/diaspora/issues/4475)
 

app/assets/stylesheets/bootstrap-headerfix.sass

@@ -32,8 +32,6 @@ header
     .notification_element
       font-size: 13px
       .timeago
-        color: #aaa
-        text-decoration: none
         border: medium none
         cursor: text
       .unread-setter

app/assets/stylesheets/header.css.scss

@@ -1,3 +1,8 @@
+.timeago {
+  color: $text-grey;
+  border-bottom: none;
+}
+
 body > #container { margin-top: 50px; } /* to avoid being hidden under the header in the SPV */
 
 body > header {
@@ -155,15 +160,16 @@ body > header {
 
       .notification_element {
         padding: 10px;
+        padding-left: 50px;
         min-height: 30px;
 
         &:hover { background-color: $highlight-white; }
 
-        > img {
+        .avatar {
           height: 30px;
           width: 30px;
           float: left;
-          margin-right: 10px;
+          margin-left: -40px;
         }
 
         &.unread {

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

@@ -135,8 +135,6 @@
     color: #3f8fba;
   }
   .timeago {
-    color: #aaaaaa;
-    text-decoration: none;
     font-size: smaller;
   }
   .count {