From 2059589731728cd6fafe50b161663cf18fcbb6cb Mon Sep 17 00:00:00 2001
From: Nate <github@najo.com>
Date: Wed, 30 Oct 2019 01:36:30 -0600
Subject: [PATCH] Theme: Add settings to control body width and (fixed) menu
 width.

---
 themes/default/app_config.php | 16 ++++++++++++++++
 themes/default/css.php        |  2 +-
 themes/default/template.php   |  4 +++-
 3 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/themes/default/app_config.php b/themes/default/app_config.php
index 19ed63c141..5495a3638e 100644
--- a/themes/default/app_config.php
+++ b/themes/default/app_config.php
@@ -166,6 +166,14 @@
 		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
 		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Set the hover color (and opacity) for the logout icon (if visible).";
 		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "47dc7c03-5738-4b9f-94fc-c5bd6cc00219";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "theme";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "menu_width_fixed";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "text";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "calc(90% - 20px)";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Set the width of the fixed menu.";
+		$y++;
 		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "028f1f3e-92dc-4d01-ae62-66cc27367508";
 		$apps[$x]['default_settings'][$y]['default_setting_category'] = "theme";
 		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "menu_main_toggle_color";
@@ -590,6 +598,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 body text.";
 		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "c5701ac7-6e69-4f5f-84e6-1fd875364a65";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "theme";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "body_width";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "text";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "90%";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Set the width of the body container.";
+		$y++;
 		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "41841015-4b58-4b38-a3f2-3c0e1fe0a17c";
 		$apps[$x]['default_settings'][$y]['default_setting_category'] = "theme";
 		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "text_link_color";
diff --git a/themes/default/css.php b/themes/default/css.php
index 3fbbd0a388..c52d6ad0c7 100644
--- a/themes/default/css.php
+++ b/themes/default/css.php
@@ -981,7 +981,7 @@ $default_login = ($_REQUEST['login'] == 'default') ? true : false;
 
 	/* default body padding */
 	.container-fluid {
-		width: 90%;
+		width: <?php echo ($_SESSION['theme']['body_width']['text'] != '') ? $_SESSION['theme']['body_width']['text'] : '90%'; ?>;
 		}
 
 	/* maximize viewport usage on xs displays */
diff --git a/themes/default/template.php b/themes/default/template.php
index f0160b68f4..77a50fe86d 100644
--- a/themes/default/template.php
+++ b/themes/default/template.php
@@ -596,7 +596,9 @@ if (!$default_login) {
 				default:
 					$menu_position = ($menu_position != '') ? $menu_position : 'top';
 					$menu_type = 'fixed-'.$menu_position;
-					$menu_width = !http_user_agent('mobile') ? 'calc(90% - 20px)' : null;
+					if (!http_user_agent('mobile')) {
+						$menu_width = $_SESSION['theme']['menu_width_fixed']['text'] != '' ? $_SESSION['theme']['menu_width_fixed']['text'] : 'calc(90% - 20px)';
+					}
 					$menu_brand = true;
 					$menu_corners = null;
 			}