Merge branch 'dev' of https://framagit.org/hubzilla/core into dev

3 files changed, 22 insertions, 17 deletions

diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 3b74c5ea1..9c3596f1b 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -1195,6 +1195,12 @@ img.mail-conv-sender-photo {
 	border-radius: $radius;
 }
 
+.widget h3 {
+	font-size: 0.9rem;
+	text-transform: uppercase;
+}
+
+
 #note-text {
 	border-radius: $radius;
 }
@@ -1272,7 +1278,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 +1474,6 @@ blockquote {
 
 .dropdown-menu {
 	color: $font_colour;
-	font-size: 0.9rem;
 	border-radius: $radius;
 }
 
@@ -1626,17 +1631,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 +1652,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 +1695,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);
@@ -1744,7 +1749,7 @@ dl.bb-dl > dd > li {
 	border-left: 0.2rem solid #eee;
 }
 
-.app-icon {
+.app-icon i {
 	color: #777;
 	font-size: 80px;
 	text-shadow: 3px 3px 3px lightgrey;
diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js
index a354682d7..c0c03d4f8 100644
--- a/view/theme/redbasic/js/redbasic.js
+++ b/view/theme/redbasic/js/redbasic.js
@@ -50,7 +50,7 @@ $(document).ready(function() {
 	});
 
 	$("input[data-role=cat-tagsinput]").tagsinput({
-		tagClass: 'badge badge-pill badge-warning text-dark'
+		tagClass: 'badge rounded-pill bg-warning text-dark'
 	});
 
 	$('a.disabled').click(function(e) {
@@ -71,7 +71,7 @@ $(document).ready(function() {
 	setInterval(function () {checkNotify();}, 10 * 1000);
 
 	var touch_start = null;
-	var touch_max = 70;
+	var touch_max = window.innerWidth / 10;
 
 	window.addEventListener('touchstart', function(e) {
 		if (e.touches.length === 1){
@@ -90,7 +90,7 @@ $(document).ready(function() {
 	window.addEventListener('touchend', function(e) {
 		$('html, body').css('overflow-y', '');
 
-		let touch_offset = 30; //at least 100px are a swipe
+		let touch_offset = 30; //at least 30px are a swipe
 		if (touch_start) {
 			//the only finger that hit the screen left it
 			let touch_end = e.changedTouches.item(0).clientX;
diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php
index d278aa309..3ea94f9aa 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)
@@ -79,7 +79,7 @@ if (! $nav_icon_colour)
 if (! $nav_active_icon_colour)
 	$nav_active_icon_colour = 'rgba(255, 255, 255, 0.75)';
 if (! $link_colour)
-	$link_colour = '#007bff';
+	$link_colour = '#0d6efd';
 if (! $banner_colour)
 	$banner_colour = '#fff';
 if (! $bgcolour)
@@ -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', '---');