Merge https://github.com/friendica/red into pending_merge

1 files changed, 18 insertions, 11 deletions

diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index ca324a89e..565b793aa 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -493,10 +493,6 @@ footer {
 	font-size: 0.7em;
 }
 
-#colorbox {
-	padding: 5px;
-}
-
 .app-name {
 	overflow: none;
 }
@@ -962,10 +958,20 @@ nav .acpopup {
 	background: none repeat scroll 0% 0% #FCF8E3 !important;
 }
 
+#cboxOverlay {
+	z-index: 1050;
+}
+
 #colorbox {
+	z-index: 1051;
+}
+
+#cboxContent {
+	padding: 3px;
 	border: 0px solid #fff;
+	border-radius: $radiuspx;
 	background-color: #fff;
-	z-index: 9;
+	z-index: 1052;
 }
 
 .settings-block {
@@ -2214,15 +2220,19 @@ aside .nav > li > a:hover, aside .nav > li > a:focus {
 }
 
 /* Modified original CSS to match input in Redbasic */
-.bootstrap-tagsinput {
+.jothidden .bootstrap-tagsinput {
 	border-color:#fff;
 	background-color: #fff;
 	box-shadow: none;
 	display: inline-block;
 	border-radius: $radiuspx;
 	cursor: text;
-	padding: 0 6px;
-	width: 70% !important;
+	padding: 0px 8px;
+	width: 100%;
+}
+
+.bootstrap-tagsinput .label {
+	font-size: 100%;
 }
 
 .jothidden .bootstrap-tagsinput:hover, .jothidden .bootstrap-tagsinput:focus {
@@ -2305,9 +2315,6 @@ aside .nav > li > a:hover, aside .nav > li > a:focus {
     right: 0px;
     background-color: #337AB7;
 }
-.label-info {
-	background-color: #337AB7;
-}
 
 .channels_ckbx, .pending_ckbx, .users_ckbx {
 	margin-top: -5px !important;