From 8b233723c5a6cbf18de438efa1d832691b0d9cce Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Wed, 14 May 2014 20:49:33 -0700
Subject: clear the jot-nets float

---
 view/css/conversation.css | 2 +-
 view/tpl/acl_selector.tpl | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'view')

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 -->
-- 
cgit v1.2.3