diff --git a/core/authentication/resources/views/email.htm b/core/authentication/resources/views/email.htm index 10c886b27e..35c795d722 100644 --- a/core/authentication/resources/views/email.htm +++ b/core/authentication/resources/views/email.htm @@ -63,6 +63,8 @@ {/if} +
+
diff --git a/core/authentication/resources/views/login.htm b/core/authentication/resources/views/login.htm index d32fb15ff7..baeb480937 100644 --- a/core/authentication/resources/views/login.htm +++ b/core/authentication/resources/views/login.htm @@ -63,6 +63,8 @@ {/if} +
+
diff --git a/core/authentication/resources/views/totp.htm b/core/authentication/resources/views/totp.htm index 02ad0306e8..7421151f83 100644 --- a/core/authentication/resources/views/totp.htm +++ b/core/authentication/resources/views/totp.htm @@ -63,6 +63,8 @@ {/if} +
+
diff --git a/core/authentication/resources/views/totp_secret.htm b/core/authentication/resources/views/totp_secret.htm index c529e98bb5..352c4c4c45 100644 --- a/core/authentication/resources/views/totp_secret.htm +++ b/core/authentication/resources/views/totp_secret.htm @@ -15,6 +15,8 @@ {/if} +
+

diff --git a/core/authentication/resources/views/username.htm b/core/authentication/resources/views/username.htm index 74263269bd..fb8c4a8b17 100644 --- a/core/authentication/resources/views/username.htm +++ b/core/authentication/resources/views/username.htm @@ -63,6 +63,8 @@ {/if} +
+
diff --git a/themes/default/app_config.php b/themes/default/app_config.php index 452d1cb6d4..cbc94763d4 100644 --- a/themes/default/app_config.php +++ b/themes/default/app_config.php @@ -880,6 +880,22 @@ $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'] = "c909eb3f-3ecf-48c6-aad1-aafbaf421a5d"; + $apps[$x]['default_settings'][$y]['default_setting_category'] = "theme"; + $apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "subcontent_shadow_color"; + $apps[$x]['default_settings'][$y]['default_setting_name'] = "text"; + $apps[$x]['default_settings'][$y]['default_setting_value'] = "#737983"; + $apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false"; + $apps[$x]['default_settings'][$y]['default_setting_description'] = "Set the color (and opacity) of the subcontent boxes."; + $y++; + $apps[$x]['default_settings'][$y]['default_setting_uuid'] = "66d54130-db92-4b82-926c-96ddfcf72659"; + $apps[$x]['default_settings'][$y]['default_setting_category'] = "theme"; + $apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "subcontent_background_color"; + $apps[$x]['default_settings'][$y]['default_setting_name'] = "text"; + $apps[$x]['default_settings'][$y]['default_setting_value'] = "#ffffff"; + $apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false"; + $apps[$x]['default_settings'][$y]['default_setting_description'] = "background color of the subcontent box."; + $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 fe4b49d705..12dabd518c 100644 --- a/themes/default/css.php +++ b/themes/default/css.php @@ -242,6 +242,8 @@ $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; +$subcontent_shadow_color = $_SESSION['theme']['subcontent_shadow_color']['text'] ?? $dashboard_shadow_color; +$subcontent_background_color = $_SESSION['theme']['subcontent_background_color']['text'] ?? ''; $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; @@ -312,36 +314,42 @@ if (!empty($_SESSION['theme'])) { //determine which background image/color settings to use (login or standard) $background_images_enabled = false; if (!empty($_SESSION['username'])) { - //logged in - use standard background images/colors + //logged in - use standard background images if (!empty($_SESSION['theme']['background_image_enabled']) && $_SESSION['theme']['background_image_enabled']['boolean'] == 'true' && is_array($_SESSION['theme']['background_image'])) { $background_images_enabled = true; $background_images = $_SESSION['theme']['background_image']; } - else { - $background_colors[0] = $_SESSION['theme']['background_color'][0] ?? null; - $background_colors[1] = $_SESSION['theme']['background_color'][1] ?? null; + + //logged in - use standard background colors + if (!empty($_SESSION['theme']['background_image_enabled']) && !empty($_SESSION['theme']['background_color'][0]) && !empty($_SESSION['theme']['background_color'][1])) { + $background_colors[0] = $_SESSION['theme']['background_color'][0]; + $background_colors[1] = $_SESSION['theme']['background_color'][1]; } + elseif (!empty($_SESSION['theme']['background_image_enabled']) && !empty($_SESSION['theme']['background_color'][0])) { + $background_colors[0] = $_SESSION['theme']['background_color'][0]; + } + } else { - //not logged in - try using login background images/colors + //not logged in - try using login background images if (isset($_SESSION['theme']['login_background_image_enabled']['boolean']) && $_SESSION['theme']['login_background_image_enabled']['boolean'] == 'true' && is_array($_SESSION['theme']['login_background_image'])) { $background_images_enabled = true; $background_images = $_SESSION['theme']['login_background_image']; } - else if (!empty($_SESSION['theme']['login_background_color'][0]) || !empty($_SESSION['theme']['login_background_color'][1])) { - $background_colors[0] = $_SESSION['theme']['login_background_color'][0] ?? null; - $background_colors[1] = $_SESSION['theme']['login_background_color'][1] ?? null; + + //otherwise, use standard background images + if (!empty($_SESSION['theme']['background_image_enabled']['boolean']) && $_SESSION['theme']['background_image_enabled']['boolean'] == 'true' && is_array($_SESSION['theme']['background_image'])) { + $background_images_enabled = true; + $background_images = $_SESSION['theme']['background_image']; } - else { - //otherwise, use standard background images/colors - if (!empty($_SESSION['theme']['background_image_enabled']['boolean']) && $_SESSION['theme']['background_image_enabled']['boolean'] == 'true' && is_array($_SESSION['theme']['background_image'])) { - $background_images_enabled = true; - $background_images = $_SESSION['theme']['background_image']; - } - else { - $background_colors[0] = $_SESSION['theme']['background_color'][0] ?? null; - $background_colors[1] = $_SESSION['theme']['background_color'][1] ?? null; - } + + //use standard background colors + if (!empty($_SESSION['theme']['background_color']) && !empty($_SESSION['theme']['background_color'][0]) && !empty($_SESSION['theme']['background_color'][1])) { + $background_colors[0] = $_SESSION['theme']['login_background_color'][0]; + $background_colors[1] = $_SESSION['theme']['login_background_color'][1]; + } + elseif (!empty($_SESSION['theme']['background_image_enabled']) && !empty($_SESSION['theme']['background_color'][0])) { + $background_colors[0] = $_SESSION['theme']['background_color'][0]; } } @@ -417,8 +425,7 @@ if ($background_images_enabled) { } //check for background color -else if (!empty($background_colors[0]) || !empty($background_colors[1])) { //background color 1 or 2 is enabled - +if (!empty($background_colors[0]) || !empty($background_colors[1])) { //background color 1 or 2 is enabled if (!empty($background_colors[0]) && empty($background_colors[1])) { // use color 1 $background_color = "background: ".$background_colors[0].";"; } @@ -427,22 +434,25 @@ else if (!empty($background_colors[0]) || !empty($background_colors[1])) { //bac } else if (!empty($background_colors[0]) && !empty($background_colors[1]) && isset($_SESSION['theme']['background_radial_gradient']['text'])) { // radial gradient $background_color = "background: ".$background_colors[0].";\n"; - $background_color .= "background: -ms-radial-gradient(center, circle, ".$background_colors[0]." 0%, ".$background_colors[1]." 100%);\n"; - $background_color .= "background: radial-gradient(circle at center, ".$background_colors[0]." 0%, ".$background_colors[1]." 100%);\n"; + $background_color .= " background: -ms-radial-gradient(center, circle, ".$background_colors[0]." 0%, ".$background_colors[1]." 100%);\n"; + $background_color .= " background: radial-gradient(circle at center, ".$background_colors[0]." 0%, ".$background_colors[1]." 100%);\n"; } else if (!empty($background_colors[0]) && !empty($background_colors[1])) { // vertical gradient $background_color = "background: ".$background_colors[0].";\n"; - $background_color .= "background: -ms-linear-gradient(top, ".$background_colors[0]." 0%, ".$background_colors[1]." 100%);\n"; - $background_color .= "background: -moz-linear-gradient(top, ".$background_colors[0]." 0%, ".$background_colors[1]." 100%);\n"; - $background_color .= "background: -o-linear-gradient(top, ".$background_colors[0]." 0%, ".$background_colors[1]." 100%);\n"; - $background_color .= "background: -webkit-gradient(linear, left top, left bottom, color-stop(0, ".$background_colors[0]."), color-stop(1, ".$background_colors[1]."));\n"; - $background_color .= "background: -webkit-linear-gradient(top, ".$background_colors[0]." 0%, ".$background_colors[1]." 100%);\n"; - $background_color .= "background: linear-gradient(to bottom, ".$background_colors[0]." 0%, ".$background_colors[1]." 100%);\n"; + $background_color .= " background: -ms-linear-gradient(top, ".$background_colors[0]." 0%, ".$background_colors[1]." 100%);\n"; + $background_color .= " background: -moz-linear-gradient(top, ".$background_colors[0]." 0%, ".$background_colors[1]." 100%);\n"; + $background_color .= " background: -o-linear-gradient(top, ".$background_colors[0]." 0%, ".$background_colors[1]." 100%);\n"; + $background_color .= " background: -webkit-gradient(linear, left top, left bottom, color-stop(0, ".$background_colors[0]."), color-stop(1, ".$background_colors[1]."));\n"; + $background_color .= " background: -webkit-linear-gradient(top, ".$background_colors[0]." 0%, ".$background_colors[1]." 100%);\n"; + $background_color .= " background: linear-gradient(to bottom, ".$background_colors[0]." 0%, ".$background_colors[1]." 100%);\n"; } } else { //default: white - $background_color = "background: #ffffff;\n"; + $background_color = ""; } + + + ?> html { @@ -462,22 +472,6 @@ else { //default: white bottom: 0; left: 0; text-align: center; - - background-repeat: no-repeat; - background-attachment: fixed; - webkit-background-size:cover; - -moz-background-size:cover; - -o-background-size:cover; - background-size:cover; } #background-video { @@ -489,7 +483,53 @@ else { //default: white right: 0; top: 0; bottom: 0; - z-index: -2; + z-index: -7; + } + + #background-image { + width: 100vw; + height: 100vh; + object-fit: cover; + position: fixed; + + background-repeat: no-repeat; + background-attachment: fixed; + webkit-background-size:cover; + -moz-background-size:cover; + -o-background-size:cover; + background-size:cover; + left: 0; + right: 0; + top: 0; + bottom: 0; + z-index: -5; + } + + #background-color { + width: 100vw; + height: 100vh; + object-fit: cover; + position: fixed; + + left: 0; + right: 0; + top: 0; + bottom: 0; + z-index: -3; } pre { @@ -2537,6 +2577,28 @@ else { //default: white border: 1px solid #5d5f5a; } +/* SUBCONTENT **********************************************************************/ + div.subcontent { + /*border: 1px solid #bae0ba;*/ + + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; + padding: 20px; + margin-bottom: 15px; + + } + /* DASHBOARD **********************************************************************/ /* login message */ @@ -2550,12 +2612,12 @@ else { //default: white margin-bottom: 15px; } - .widget { + div.widget { } diff --git a/themes/default/template.php b/themes/default/template.php index 2e695b4c4b..c77f690ad2 100644 --- a/themes/default/template.php +++ b/themes/default/template.php @@ -1182,64 +1182,70 @@ {/if} + {*//image background *} +
+ + {*//color background *} +
+ {*//message container *} -
+
{*//domain selector *} - {if $authenticated && $domain_selector_enabled} + {if $authenticated && $domain_selector_enabled} -
- -
- -
+
+ + - - {/if} - - {*//qr code container for contacts *} - + {/if} + + {*//qr code container for contacts *} + + {*//login page *} - {if !empty($login_page)} -
-
- {$document_body} -
- + {if !empty($login_page)} +
+
+ {$document_body} +
+ {*//other pages *} - {else} - {if $settings.theme.menu_style == 'side' || $settings.theme.menu_style == 'inline' || $settings.theme.menu_style == 'static'} - {$container_open} - {if $settings.theme.menu_style == 'inline'}{$logo}{/if} - {$menu} - {if $settings.theme.menu_style == 'inline' || $settings.theme.menu_style == 'static'}
{/if} - {if $settings.theme.menu_style == 'side'}{/if} - {else} {*//default: fixed *} - {$menu} - {$container_open} - {/if} -
- {$document_body} -
- - {$container_close} + {else} + {if $settings.theme.menu_style == 'side' || $settings.theme.menu_style == 'inline' || $settings.theme.menu_style == 'static'} + {$container_open} + {if $settings.theme.menu_style == 'inline'}{$logo}{/if} + {$menu} + {if $settings.theme.menu_style == 'inline' || $settings.theme.menu_style == 'static'}
{/if} + {if $settings.theme.menu_style == 'side'}{/if} + {else} {*//default: fixed *} + {$menu} + {$container_open} {/if} +
+ {$document_body} +
+ + {$container_close} + {/if}