Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge

2017-06-20 18:39:27 -07:00
parent 7e4e2f28db 76e9809169
commit 99ff808b8a
16 changed files with 385 additions and 2539 deletions
--- a/view/css/bootstrap-red.css
+++ b/view/css/bootstrap-red.css
@@ -46,12 +46,6 @@ nav .dropdown-menu {
 	overflow: auto;
 }

-/* this is a hack and needs fixing in bootstrap */
-nav .dropdown-menu-right {
-	right: 0;
-	left: auto !important;
-}
-
 #navbar-collapse-2 {
 	flex-basis: 100%;
 	max-height: 70vh;