Merge remote-tracking branch 'upstream/dev' into website-export

2016-08-23 06:57:10 -04:00
parent 305e0538d2 1e6a491400
commit 420aa4bc44
28 changed files with 6126 additions and 5926 deletions
--- a/view/css/conversation.css
+++ b/view/css/conversation.css
@@ -1,6 +1,6 @@
 /* jot */

-.jothidden input {
+.jothidden input[type="text"] {
 	border: 0px;
 	margin: 0px;
 	height: 39px;
@@ -70,6 +70,10 @@
 	margin-bottom: 30px;
 }

+#profile-jot-plugin-wrapper {
+	margin-top: 10px;
+}
+
 #profile-rotator-wrapper {
 	float: left;
 }
@@ -78,14 +82,6 @@
 	padding: 15px 0px 0px 15px;
 }

-.profile-jot-net {
-	float: left;
-	margin-right: 10px;
-	margin-top: 5px;
-	margin-bottom: 5px;
-	padding: 5px;
-}
-
 /* conversation */

 .thread-wrapper.toplevel_item {