aboutsummaryrefslogtreecommitdiffstats
path: root/view/css
diff options
context:
space:
mode:
authorAndrew Manning <tamanning@zoho.com>2016-08-23 06:57:10 -0400
committerAndrew Manning <tamanning@zoho.com>2016-08-23 06:57:10 -0400
commit420aa4bc44a2fdf707b3964582258809f978ea2d (patch)
treec6def258a9311d513d6e1e89918c2ec0d17114f7 /view/css
parent305e0538d293ff4ad72f30b11998ae3b06efa4ea (diff)
parent1e6a491400eaa01aeb2991d4b38e0255499d8b67 (diff)
downloadvolse-hubzilla-420aa4bc44a2fdf707b3964582258809f978ea2d.tar.gz
volse-hubzilla-420aa4bc44a2fdf707b3964582258809f978ea2d.tar.bz2
volse-hubzilla-420aa4bc44a2fdf707b3964582258809f978ea2d.zip
Merge remote-tracking branch 'upstream/dev' into website-export
Diffstat (limited to 'view/css')
-rw-r--r--view/css/conversation.css14
1 files changed, 5 insertions, 9 deletions
diff --git a/view/css/conversation.css b/view/css/conversation.css
index 5af0c55e7..6c5171545 100644
--- 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 {