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

4 files changed, 29 insertions, 4 deletions

diff --git a/boot.php b/boot.php
index e368896ca..a5a48b2bf 100755
--- a/boot.php
+++ b/boot.php
@@ -491,7 +491,7 @@ define ( 'ACCOUNT_PENDING',      0x0010 );
 
 define ( 'ACCOUNT_ROLE_ALLOWCODE', 0x0001 );    
 define ( 'ACCOUNT_ROLE_SYSTEM',    0x0002 );
-
+define ( 'ACCOUNT_ROLE_DEVELOPER', 0x0004 );
 define ( 'ACCOUNT_ROLE_ADMIN',     0x1000 );
 
 /**
@@ -1704,6 +1704,15 @@ function is_site_admin() {
 	return false;
 }
 
+function is_developer() {
+	$a = get_app();
+	if((intval($_SESSION['authenticated'])) 
+		&& (is_array($a->account)) 
+		&& ($a->account['account_roles'] & ACCOUNT_ROLE_DEVELOPER))
+		return true;
+	return false;
+}
+
 
 
 function load_contact_links($uid) {
diff --git a/view/css/default.css b/view/css/default.css
index 779b1cb13..a98374960 100644
--- a/view/css/default.css
+++ b/view/css/default.css
@@ -21,5 +21,5 @@ section {
 	width: 100%;
 	display: table-cell;
 	vertical-align: top;
-	padding: 65px 0px 200px 10px;
+	padding: 65px 15px 200px 10px;
 }
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 19e82b057..67aa6a3c1 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -2253,6 +2253,10 @@ blockquote {
 	border-color: $nav_bd;
 }
 
+.navbar-inverse .navbar-collapse {
+	border-color: $nav_bd;
+}
+
 .navbar-inverse .navbar-nav > .active > a {
 	background-image: -webkit-linear-gradient(top, $nav_active_gradient_top 0%, $nav_active_gradient_bottom 100%);
 	background-image:         linear-gradient(to bottom, $nav_active_gradient_top 0%, $nav_active_gradient_bottom 100%);
@@ -2283,12 +2287,24 @@ blockquote {
 	color: $nav_active_icon_colour;
 }
 
+.navbar-inverse .navbar-toggle {
+	border-color: $nav_bd;
+}
+.navbar-inverse .navbar-toggle:hover,
+.navbar-inverse .navbar-toggle:focus {
+	background-color: $nav_bg;
+}
+
+.navbar-inverse .navbar-toggle .icon-bar {
+	background-color: $nav_active_icon_colour;
+}
+
 #expand-aside {
 	color: $nav_active_icon_colour;
 	padding: 7px 10px;
 }
 
-@media screen and (max-width:767px) {
+@media (max-width:767px) {
 	aside#region_1 {
 		background: rgba(0, 0, 0, .1);
 		border-right: 1px solid $nav_bd;
diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php
index 4bb852a40..8fb4de381 100644
--- a/view/theme/redbasic/php/style.php
+++ b/view/theme/redbasic/php/style.php
@@ -81,7 +81,7 @@ if(! $a->install) {
 	if (! $nav_active_gradient_bottom)
 		$nav_active_gradient_bottom = "#282828";
 	if (! $nav_bd)
-		$nav_bd = "#080808";
+		$nav_bd = "#222";
 	if (! $nav_icon_colour)
 		$nav_icon_colour = "#999";
 	if (! $nav_active_icon_colour)