From: mmn <mmn@hethane.se>
Date: Fri, 5 Jun 2015 22:38:13 +0000 (+0000)
Subject: Merge branch 'threaded_replies_nightly' into 'nightly'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=1635d459ec1988104f28f3346c45ee5aebbfcc1a;hp=e3b1d401fd063885d2030d2f152b51363008a273;p=quix0rs-gnu-social.git

Merge branch 'threaded_replies_nightly' into 'nightly'

Fix threaded replies floating

Following Marcus fixes for neo-quitter, I think the floating of replies should be fixed directly in the base theme. What do you think? This issue affects all derived themes (although sometimes only marginally) see https://gnusocial.no/conversation/126588.

These commits implement some of Marcus floating fixes directly in base plus the fav, reply icons are better aligned with the permalink and timestamp (notice-options change).

See merge request !7
---

diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index 7662397f40..949f40e791 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -733,7 +733,6 @@ font-style:italic;
 
 .notice-options {
     margin-bottom: 7px;
-    margin-top: 12px;
     float: right;    
     position: relative;
 }
@@ -863,7 +862,6 @@ content: ":";
 
 .threaded-replies {
     clear: both;
-    float: left;
     width: 458px;
     margin-left: 55px;
     margin-bottom: 10px;
@@ -993,7 +991,6 @@ content: ":";
 /* old school conversation style */
 
 #conversation .notices .notices {
-    float: left;
     background-color:rgba(200, 200, 200, 0.050);
     margin-left: 15px;
     width: auto;