From 3fc209025edd2b951917420fbf7d69f7c9ef69b8 Mon Sep 17 00:00:00 2001
From: fusionate <nate@fusionpbx.com>
Date: Wed, 4 Sep 2024 19:01:16 -0600
Subject: [PATCH] Theme: Additional Default Settings to control the style of
 content cards.

---
 themes/default/app_config.php | 40 +++++++++++++++++++++++++
 themes/default/css.php        | 55 +++++++++++++++++++++++++----------
 2 files changed, 79 insertions(+), 16 deletions(-)

diff --git a/themes/default/app_config.php b/themes/default/app_config.php
index 8f30a0b35d..f4f907f3f6 100644
--- a/themes/default/app_config.php
+++ b/themes/default/app_config.php
@@ -888,6 +888,14 @@
 		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
 		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Set the bottom border (dividing line) color (and opacity) of table data rows.";
 		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "1ea2c5b7-6044-444b-8998-39a47ae168a1";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "theme";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "card_padding";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "text";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "20px";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Set the amount of padding content cards have.";
+		$y++;
 		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "2bd1a660-78cb-41e6-9291-5c71db7da2d7";
 		$apps[$x]['default_settings'][$y]['default_setting_category'] = "theme";
 		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "card_shadow_color";
@@ -896,6 +904,14 @@
 		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
 		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Set the color (and opacity) of the content cards.";
 		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "60b37b70-f589-4c0d-999f-7d7f3f8fd7d5";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "theme";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "card_shadow_size";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "text";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "7px";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Set the size of the content card shadow.";
+		$y++;
 		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "c015e81b-9a5f-47b7-b8b2-8d002167fbdf";
 		$apps[$x]['default_settings'][$y]['default_setting_category'] = "theme";
 		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "card_background_color";
@@ -904,6 +920,30 @@
 		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
 		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Set the background color of the content cards.";
 		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "06c3a0df-859e-41ab-a85e-8ac859ec9047";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "theme";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "card_border_color";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "text";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "#a4aebf;";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Set the border color of the content cards.";
+		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "26fa3bae-6b72-4fee-92ec-a2f8bd22217b";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "theme";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "card_border_size";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "text";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "1px";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Set the border size of the content cards.";
+		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "87dd5336-21dd-41b9-a69e-323fea8aa8cb";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "theme";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "card_border_radius";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "text";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "3px";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Set the border radius of the content cards.";
+		$y++;
 		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "3b46602c-c736-43ec-a4b5-c733110dbe57";
 		$apps[$x]['default_settings'][$y]['default_setting_category'] = "theme";
 		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "dashboard_border_color";
diff --git a/themes/default/css.php b/themes/default/css.php
index 12fe118b21..b8cb2cec26 100644
--- a/themes/default/css.php
+++ b/themes/default/css.php
@@ -242,8 +242,13 @@ $dashboard_footer_background_color = $_SESSION['theme']['dashboard_footer_backgr
 $dashboard_footer_background_color_hover = $_SESSION['theme']['dashboard_footer_background_color_hover']['text'] ?? color_adjust($dashboard_footer_background_color, 0.02);
 $dashboard_footer_dots_color = $_SESSION['theme']['dashboard_footer_dots_color']['text'] ?? '#a4aebf';
 $dashboard_footer_dots_color_hover = $_SESSION['theme']['dashboard_footer_dots_color_hover']['text'] ?? $dashboard_footer_dots_color;
-$card_shadow_color = $_SESSION['theme']['card_shadow_color']['text'] ?? '';
-$card_background_color = $_SESSION['theme']['card_background_color']['text'] ?? '';
+$card_padding = $_SESSION['theme']['card_padding']['text'] ?? '0';
+$card_shadow_color = $_SESSION['theme']['card_shadow_color']['text'] ?? null;
+$card_shadow_size = $_SESSION['theme']['card_shadow_size']['text'] ?? null;
+$card_background_color = $_SESSION['theme']['card_background_color']['text'] ?? null;
+$card_border_color = $_SESSION['theme']['card_border_color']['text'] ?? null;
+$card_border_size = $_SESSION['theme']['card_border_size']['text'] ?? null;
+$card_border_radius = $_SESSION['theme']['card_border_radius']['text'] ?? '0';
 $action_bar_border_top = $_SESSION['theme']['action_bar_border_top']['text'] ?? 0;
 $action_bar_border_right = $_SESSION['theme']['action_bar_border_right']['text'] ?? 0;
 $action_bar_border_bottom = $_SESSION['theme']['action_bar_border_bottom']['text'] ?? 0;
@@ -2586,22 +2591,40 @@ else { //default: white
 /* CARD **********************************************************************/
 
 	div.card {
-		/*border: 1px solid #bae0ba;*/
-		<?php
-		if (!empty($card_background_color)) {
-			echo "background-color: " .$card_background_color.";\n";
-		}
-		?>
-		-webkit-border-radius: 3px;
-		-moz-border-radius: 3px;
-		border-radius: 3px;
-		padding: 20px;
 		margin-bottom: 15px;
 		<?php
-		if (!empty($card_shadow_color)) {
-			echo "-webkit-box-shadow: 0 px 7px ".$card_shadow_color.";\n";
-			echo "-moz-box-shadow: 0 2px 7px ".$card_shadow_color.";\n";
-			echo "box-shadow: 0 2px 7px ".$card_shadow_color.";\n";
+		if (isset($card_border_size) || !empty($card_border_color) || !empty($card_background_color) || !empty($card_shadow_color)) {
+			if (isset($card_border_size) && !empty($card_border_color)) {
+				echo "border: ".$card_border_size." solid ".$card_border_color.";\n";
+			}
+			else {
+				echo "border: none !important;\n";
+			}
+			if (isset($card_border_radius) || (isset($card_border_size) || !empty($card_border_color))) {
+				echo "-webkit-border-radius: ".($card_border_radius ?? '0')." !important;\n";
+				echo "-moz-border-radius: ".($card_border_radius ?? '0')." !important;\n";
+				echo "border-radius: ".($card_border_radius ?? '0')." !important;\n";
+			}
+			echo "padding: ".$card_padding.";\n";
+			if (!empty($card_background_color)) {
+				echo "background-color: " .$card_background_color.";\n";
+			}
+			if (!empty($card_shadow_color)) {
+				echo "-webkit-box-shadow: 0 2px ".($card_shadow_size ?? '7px')." ".$card_shadow_color.";\n";
+				echo "-moz-box-shadow: 0 2px ".($card_shadow_size ?? '7px')." ".$card_shadow_color.";\n";
+				echo "box-shadow: 0 2px ".($card_shadow_size ?? '7px')." ".$card_shadow_color.";\n";
+			}
+		}
+		else {
+			echo "border: 0;\n";
+			echo "-webkit-border-radius: 0 !important;\n";
+			echo "-moz-border-radius: 0 !important;\n";
+			echo "border-radius: 0 !important;\n";
+			echo "padding: 0;\n";
+			echo "background-color: none;\n";
+			echo "-webkit-box-shadow: none;\n";
+			echo "-moz-box-shadow: none;\n";
+			echo "box-shadow: none;\n";
 		}
 		?>
 		}