From b8ad22f525bf1df458e00eef43be2259a04a51f0 Mon Sep 17 00:00:00 2001
From: jeroenpraat <jeroenpraat@xs4all.nl>
Date: Sat, 11 Mar 2017 21:09:42 +0100
Subject: [PATCH 1/3] Login-box css-fix for Bluegrid scheme

---
 view/theme/redbasic/schema/bluegrid.css | 26 ++++++++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/view/theme/redbasic/schema/bluegrid.css b/view/theme/redbasic/schema/bluegrid.css
index 64e5a2c95..46e28197e 100644
--- a/view/theme/redbasic/schema/bluegrid.css
+++ b/view/theme/redbasic/schema/bluegrid.css
@@ -116,7 +116,7 @@ input#jot-title:hover, input#jot-title:focus {
 }
 
 nav .dropdown-menu, .wall-item-tools .dropdown-menu, .section-title-wrapper .dropdown-menu, .section-content-wrapper .dropdown-menu {
-    background-color: rgba(67,72,138,.97);
+    background-color: #43488A;
     color: #fff;
     border-radius: 0;
     border: none;
@@ -304,6 +304,30 @@ input {
 
 #login-main {
     margin-top: 0;
+    color: #EEE;
+}
+
+#remember_me_container label:hover, #remember_container label:hover {
+    color: #FFF;
+}
+
+#login-main #lost-password-link, #login-main #register-link {
+    color: #FFF;
+}
+
+#nav-login .modal-content {
+	background-color: #43488A;
+	background-image: url('/images/bggrid.png');
+	box-shadow: 0 5px 15px rgba(0,0,0,.3);
+	-webkit-box-shadow: 0 5px 15px rgba(0,0,0,.3);
+}
+
+#nav-login h3, #nav-login button.close {
+    color: #EEE;
+}
+
+#nav-login .modal-header {
+	border-bottom: none;
 }
 
 .directory-item {

From f68148b7e0930c57b7f4c47e7b3c170437989e62 Mon Sep 17 00:00:00 2001
From: Andrew Manning <tamanning@zoho.com>
Date: Sun, 12 Mar 2017 13:57:45 -0400
Subject: [PATCH 2/3] Add id to app-menu for JS access

---
 view/tpl/nav.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl
index 0581989ec..11e107d2a 100755
--- a/view/tpl/nav.tpl
+++ b/view/tpl/nav.tpl
@@ -177,7 +177,7 @@
 				<a class="{{$nav.help.2}}" target="hubzilla-help" href="{{$nav.help.0}}" title="{{$nav.help.3}}" id="{{$nav.help.4}}" onclick="contextualHelp(); return false;"><i class="fa fa-question-circle"></i></a>
 			</li>
 			{{/if}}
-			<li class="">
+			<li class="" id="app-menu">
 				<a href="#" data-toggle="dropdown"><i class="fa fa-bars"></i></a>
 				<ul class="dropdown-menu">
 					{{foreach $navapps as $navapp}}

From 9f0c3b496b0b58c8ef21810ac7ecc690e350d884 Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Mon, 13 Mar 2017 10:29:26 +0100
Subject: [PATCH 3/3] we need to have this even if we are not the owner.
 otherwise we loose the acl if e.g. not-owner edits a webpage. should probably
 find a better solution for this though.

---
 view/tpl/jot.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl
index 377eef453..991873daa 100755
--- a/view/tpl/jot.tpl
+++ b/view/tpl/jot.tpl
@@ -217,7 +217,7 @@
 
 <div id="jot-preview-content" style="display:none;"></div>
 
-{{if $showacl}}{{$acl}}{{/if}}
+{{$acl}}
 
 {{if $feature_expire}}
 <!-- Modal for item expiry-->