Merge branch 'nightly' of git.gnu.io:gnu/gnu-social into nightly

This commit is contained in:
abjectio 2015-06-06 11:31:18 +02:00
commit b0a598ba7b

View File

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