aboutsummaryrefslogtreecommitdiffstats
path: root/view
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2014-05-14 20:49:33 -0700
committerfriendica <info@friendica.com>2014-05-14 20:49:33 -0700
commit8b233723c5a6cbf18de438efa1d832691b0d9cce (patch)
tree17fb14a204b95bfc1e3b67f73062f49a4c6ca058 /view
parente5e479b4053018ae299da706239acf5aaec5ca7e (diff)
downloadvolse-hubzilla-8b233723c5a6cbf18de438efa1d832691b0d9cce.tar.gz
volse-hubzilla-8b233723c5a6cbf18de438efa1d832691b0d9cce.tar.bz2
volse-hubzilla-8b233723c5a6cbf18de438efa1d832691b0d9cce.zip
clear the jot-nets float
Diffstat (limited to 'view')
-rw-r--r--view/css/conversation.css2
-rwxr-xr-xview/tpl/acl_selector.tpl2
2 files changed, 2 insertions, 2 deletions
diff --git a/view/css/conversation.css b/view/css/conversation.css
index 829630c55..4e7b59f80 100644
--- a/view/css/conversation.css
+++ b/view/css/conversation.css
@@ -46,12 +46,12 @@
margin: 16px;
}
-/* this is referenced in js/acl.js - not sure if it is still needed. */
.profile-jot-net {
float: left;
margin-right: 10px;
margin-top: 5px;
margin-bottom: 5px;
+ padding: 5px;
}
/* conversation */
diff --git a/view/tpl/acl_selector.tpl b/view/tpl/acl_selector.tpl
index 722d541ed..4babf5669 100755
--- a/view/tpl/acl_selector.tpl
+++ b/view/tpl/acl_selector.tpl
@@ -23,7 +23,7 @@
{{$jotnets}}
{{/if}}
</div>
- <div class="modal-footer">
+ <div class="modal-footer clear">
<button type="button" class="btn btn-default" data-dismiss="modal">{{$aclModalDismiss}}</button>
</div>
</div><!-- /.modal-content -->