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

2017-06-07 17:11:35 -07:00
parent 2e35dc648f 55836e8ca6
commit 9dbd997141
32 changed files with 3492 additions and 570 deletions
--- a/view/css/bootstrap-red.css
+++ b/view/css/bootstrap-red.css
@@ -46,6 +46,12 @@ 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;