Merge branch 'bs5' into 'dev'

Update to bootstrap 5 and implement next generation app menu (work in progress)

See merge request hubzilla/core!1980

2 files changed, 11 insertions, 12 deletions

diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 3b74c5ea1..811df02e4 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -1272,7 +1272,7 @@ img.mail-conv-sender-photo {
 	border-radius: $radius;
 }
 
-#nav-app-link {
+#nav-app-link-wrapper.has_location .nav-link {
 	padding: 0 !important;
 	line-height: 1.175;
 	white-space: nowrap;
@@ -1468,7 +1468,6 @@ blockquote {
 
 .dropdown-menu {
 	color: $font_colour;
-	font-size: 0.9rem;
 	border-radius: $radius;
 }
 
@@ -1626,17 +1625,17 @@ dl.bb-dl > dd > li {
 
 
 /* Turn checkboxes into switches */
-.form-group.checkbox > div {
+.onoffswitch.checkbox > div {
     position: relative; width: 60px;
     -webkit-user-select:none; -moz-user-select:none; -ms-user-select: none;
     display:inline-block;
 }
 
-.form-group.checkbox input {
+.onoffswitch.checkbox input {
     display: none;
 }
 
-.form-group.checkbox > div label {
+.onoffswitch.checkbox > div label {
 	display: block; overflow: hidden; cursor: pointer;
 	border: 1px solid #ccc;
 	border-radius: 12px;
@@ -1647,11 +1646,11 @@ dl.bb-dl > dd > li {
 	font-weight: normal;
 }
 
-.form-group.checkbox:hover label {
+.onoffswitch.checkbox:hover label {
 	color: $link_colour;
 }
 
-.form-group.checkbox:hover > div label {
+.onoffswitch.checkbox:hover > div label {
 	border-color: $link_colour;
 }
 
@@ -1690,17 +1689,17 @@ dl.bb-dl > dd > li {
     -o-transition: all 0.3s ease-in 0s; transition: all 0.3s ease-in 0s;
 }
 
-.form-group.checkbox > div > input:checked + label .onoffswitch-inner {
+.onoffswitch.checkbox > div > input:checked + label .onoffswitch-inner {
     margin-left: 0px;
 }
 
-.form-group.checkbox > div > input:checked + label .onoffswitch-switch {
+.onoffswitch.checkbox > div > input:checked + label .onoffswitch-switch {
     right: 0px;
     background-color: #0275d8;
 }
 
 
-.form-group.checkbox > div > input:disabled + label .onoffswitch-switch {
+.onoffswitch.checkbox > div > input:disabled + label .onoffswitch-switch {
 	background-color: red;
 	opacity: 0.3;
 	filter:alpha(opacity=30);
diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php
index d278aa309..4fb239cb6 100644
--- a/view/theme/redbasic/php/style.php
+++ b/view/theme/redbasic/php/style.php
@@ -69,7 +69,7 @@ if ((!$schema) || ($schema == '---')) {
 	}
 
 }
-		
+
 //Set some defaults - we have to do this after pulling owner settings, and we have to check for each setting
 //individually.  If we don't, we'll have problems if a user has set one, but not all options.
 if (! $nav_bg)
@@ -158,7 +158,7 @@ if(file_exists('view/theme/redbasic/css/style.css')) {
 
 }
 
-// Set the schema to the default schema in derived themes. See the documentation for creating derived themes how to override this. 
+// Set the schema to the default schema in derived themes. See the documentation for creating derived themes how to override this.
 
 if(local_channel() && App::$channel && App::$channel['channel_theme'] != 'redbasic')
 	set_pconfig(local_channel(), 'redbasic', 'schema', '---');