Merge branch '7.0RC'

4 files changed, 34 insertions, 20 deletions

diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index ac5b6a80a..cea9b8ae5 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -397,7 +397,6 @@ footer {
 .fn {
 	font-weight: bold;
 	font-size: 1rem;
-	color: #444444;
 }
 
 .vcard-card {
@@ -418,11 +417,6 @@ footer {
 	filter:alpha(opacity=100);
 }
 
-#profile-photo-wrapper img {
-	width: 100%;
-	height: 100%;
-}
-
 #hide-friends-yes-label,
 #hide-friends-no-label {
 	margin-left: 125px;
@@ -1223,24 +1217,24 @@ img.mail-conv-sender-photo {
 }
 
 .menu-img-3 {
-	width: 3.3em;
-	height: 3.3em;
+	width: 2.7rem;
+	height: 2.7rem;
 	margin-right: 5px;
 	border-radius: $radius;
 	float: left;
 }
 
 .menu-img-2 {
-	height: 2.2em;
-	width: 2.2em;
+	height: 1.8rem;
+	width: 1.8rem;
 	margin-right: 5px;
 	border-radius: $radius;
 	float: left;
 }
 
 .menu-img-1 {
-	height: 1.28571429em;
-	width: 1.28571429em;
+	height: 1.1rem;
+	width: 1.1rem;
 	border-radius: $radius;
 }
 
@@ -1676,7 +1670,7 @@ dl.bb-dl > dd > li {
 
 .onoffswitch.checkbox > div > input:checked + label .onoffswitch-switch {
     right: 0px;
-    background-color: #0275d8;
+    background-color: $link_colour;
 }
 
 
@@ -1784,7 +1778,7 @@ dl.bb-dl > dd > li {
 
 .oneway-overlay {
     position: absolute;
-    text-shadow: -2px 0 1px #fff, 0 2px 1px#fff, 2px 0 1px #fff, 0 -2px 1px #fff;
+    text-shadow: -1px 0 1px #fff, 0 1px 1px#fff, 1px 0 1px #fff, 0 -1px 1px #fff;
 }
 
 .cover-photo-review {
diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php
index 9b8ac455a..9cb835ec6 100644
--- a/view/theme/redbasic/php/style.php
+++ b/view/theme/redbasic/php/style.php
@@ -75,7 +75,7 @@ if ((!$schema) || ($schema == '---')) {
 if (! $nav_bg)
 	$nav_bg = '#343a40';
 if (! $nav_icon_colour)
-	$nav_icon_colour = 'rgba(255, 255, 255, 0.5)';
+	$nav_icon_colour = 'rgba(255, 255, 255, 0.55)';
 if (! $nav_active_icon_colour)
 	$nav_active_icon_colour = 'rgba(255, 255, 255, 0.75)';
 if (! $link_colour)
diff --git a/view/theme/redbasic/php/theme.php b/view/theme/redbasic/php/theme.php
index 3c07e1582..783bd9d4e 100644
--- a/view/theme/redbasic/php/theme.php
+++ b/view/theme/redbasic/php/theme.php
@@ -3,12 +3,14 @@
 /**
  *   * Name: Redbasic
  *   * Description: Hubzilla standard theme
- *   * Version: 2.1
- *   * MinVersion: 5.9
- *   * MaxVersion: 7.0
+ *   * Version: 2.2
+ *   * MinVersion: 6.5.13
+ *   * MaxVersion: 8.0
  *   * Author: Fabrixxm
  *   * Maintainer: Mike Macgirvin
  *   * Maintainer: Mario Vavti
+ *   * Theme_Color: #343a40
+ *   * Background_Color: rgb(254,254,254)
  */
 
 function redbasic_init(&$a) {
diff --git a/view/theme/redbasic/schema/Focus-Boxy.css b/view/theme/redbasic/schema/Focus-Boxy.css
index b9b259796..90fd51b02 100644
--- a/view/theme/redbasic/schema/Focus-Boxy.css
+++ b/view/theme/redbasic/schema/Focus-Boxy.css
@@ -3,13 +3,31 @@
 }
 
 .wall-item-content-wrapper.comment {
-	border-bottom: 1px solid #dee2e6;
+	border-bottom: 1px solid rgba(0,0,0,.125);
 }
 
 .widget {
-	border: 1px solid #dee2e6;
+	border: 1px solid rgba(0,0,0,.125);
 }
 
 #note-text {
 	border: 1px solid transparent;
 }
+
+.vcard-card {
+	border: 1px solid rgba(0,0,0,.125);
+	border-bottom: 0;
+}
+
+.vcard-card .card {
+	border-top: 0;
+	border-right: 0;
+	border-left: 0;
+}
+
+.vcard-card .vcard {
+	border: 1px solid rgba(0,0,0,.125);
+	border-top: 0;
+	border-right: 0;
+	border-left: 0;
+}