Merge pull request wielebenwir#1318 from wielebenwir/merge-release2.8.1

Merge release2.8.1

Readme.md

@@ -8,7 +8,7 @@ Donate link: https://www.wielebenwir.de/verein/unterstutzen
 Tags: booking, commons, sharing, calendar, commoning, open-source, booking system, booking calendar  
 Requires at least: 5.2  
 Tested up to: 6.0  
-Stable Tag: 2.8  
+Stable Tag: 2.8.1 
 Requires PHP: 7.4 or higher  
 License: GPLv2 or later  
 License URI: http://www.gnu.org/licenses/gpl-2.0.html  
@@ -91,6 +91,15 @@ CommonsBooking was developed for the ["Commons Cargobike" movement](http://commo
 
 ## Changelog 
 
+### 2.8.1 (xx.06.2023)
+* FIXED: Wrong field value for iCal events (the field value is reset, you have to re-set your values after updating)
+* FIXED: Bug sending cancellation mail to admin on admin cancellation
+* FIXED: Availability text for items in item shortcode (Merged display of overlapping timeframes)
+* FIXED: Location without addresses not displayed correctly
+* FIXED: Incorrect error messages displayed to user during booking process
+* ENHANCED: Improved booking validation
+* ENHANCED: Default value for days that are bookable in advance set to 31
+
 ### 2.8 (27.04.2023)
 * NEW: Added option to set a minimum offset for bookings. This allows to set a minimum time between booking and pickup.
 * NEW: Added ability to create bookings from the backend.

assets/global/sass/partials/_extends.scss

@@ -116,10 +116,11 @@
 	}
 
 	&[disabled=disabled] {
-		background-color: var(--commonsbooking-color-bg);
-		color: var(--commonsbooking-color-greyedout);
+		background-color: var(--commonsbooking-color-greyedout);
+		color: var(--commonsbooking-textcolor-light);
+        @extend .shadow-small;
 	}
-	
+
 	&.no-right-radius {
 		border-radius: var(--commonsbooking-radius) 0 ;
 	}	

assets/global/sass/partials/_variables.scss

@@ -13,15 +13,15 @@ $color-green-dark: #84AE53;
 $color-green-neon: #74ce3c;
 $color-blue-dark: #506CA9;
 $color-yellow: #FFF9C5;
-$color-gray: #f6f6f6;
+$color-gray: #e0e0e0;
 
 
 /* Colors: text */
 $color-orange: #ff9218;
 $color-warningred: #d5425c;
 $color-gray-dark: #444;
 $color-gray-silver: #9D9F9D;
-$color-gray-light: #c4c4c4;
+$color-gray-light: #a0a0a0;
 $color-black: #000;
 $color-white: #FFF;
 

assets/public/sass/partials/_forms.scss

@@ -81,7 +81,7 @@
         }
     }
 
-    input.cb-action-canceled {
+    input.cb-action-canceled, input.cb-action-delete_unconfirmed {
         background-color: var(--commonsbooking-color-cancel);
         box-shadow: none !important;
         font-size: 0.875rem;

commonsbooking.php

@@ -2,7 +2,7 @@
 
 /**
  * Plugin Name:         Commons Booking
- * Version:             2.8
+ * Version:             2.8.1
  * Requires at least:   5.2
  * Requires PHP:        7.4
  * Plugin URI:          https://commonsbooking.org
@@ -18,7 +18,7 @@
 use CommonsBooking\Plugin;
 
 defined('ABSPATH') or die("Thanks for visting");
-define('COMMONSBOOKING_VERSION', '2.8');
+define('COMMONSBOOKING_VERSION', '2.8.1');
 define('COMMONSBOOKING_PLUGIN_SLUG', 'commonsbooking');
 define('COMMONSBOOKING_MENU_SLUG', COMMONSBOOKING_PLUGIN_SLUG . '-menu');
 define('COMMONSBOOKING_PLUGIN_DIR', wp_normalize_path( plugin_dir_path(__FILE__)));

includes/OptionsArray.php

@@ -472,7 +472,7 @@
 						'id'      => 'colorscheme_greyedoutcolor',
 						'type'    => 'colorpicker',
 						'desc'    => commonsbooking_sanitizeHTML( __( 'The color used to signify that no timeframe has been created for an item or a button that is not yet clickable', 'commonsbooking' ) ),
-						'default' => '#f6f6f6',
+						'default' => '#e0e0e0',
 					),
 
 					array(
@@ -495,7 +495,7 @@
 						'id'      => 'colorscheme_lighttext',
 						'type'    => 'colorpicker',
 						'desc'    => commonsbooking_sanitizeHTML( __( 'The color used for light text on dark backgrounds', 'commonsbooking' ) ),
-						'default' => '#c4c4c4',
+						'default' => '#a0a0a0',
 					),
 					array(
 						'name'    => commonsbooking_sanitizeHTML( __( 'Dark text color', 'commonsbooking' ) ),