aboutsummaryrefslogtreecommitdiffstats
path: root/view/css
diff options
context:
space:
mode:
authorredmatrix <git@macgirvin.com>2016-08-21 16:33:59 -0700
committerredmatrix <git@macgirvin.com>2016-08-21 16:33:59 -0700
commitb6a545b4a279061c7e786dbfe4d63679bfe18e07 (patch)
tree7da62eb162b2c26116923bf5995d6499f840b4c8 /view/css
parent4d34d9c03269ea9b8ca038a87f5351cfe4dbeff1 (diff)
parent4f62d7a78f63e4bae136f52d70d0af906d997b78 (diff)
downloadvolse-hubzilla-b6a545b4a279061c7e786dbfe4d63679bfe18e07.tar.gz
volse-hubzilla-b6a545b4a279061c7e786dbfe4d63679bfe18e07.tar.bz2
volse-hubzilla-b6a545b4a279061c7e786dbfe4d63679bfe18e07.zip
Merge branch 'dev' of https://github.com/git-marijus/hubzilla into git-marijus-dev
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 {