diff --git a/roles/nginx-global-css/templates/global.css.j2 b/roles/nginx-global-css/templates/global.css.j2 index 4565216b..66572bcb 100644 --- a/roles/nginx-global-css/templates/global.css.j2 +++ b/roles/nginx-global-css/templates/global.css.j2 @@ -75,9 +75,9 @@ button:hover, .btn:hover { color: var(--text-color) !important; } -/* Inputs & Forms (Background, Text, Border, and Focus Shadow) */ +/* Inputs & Forms in Light Mode (Using a Light Tone from the Corporate Design) */ input, textarea, select { - background-color: var(--background-color) !important; + background-color: var(--info-color) !important; /* Instead of var(--background-color) */ color: var(--text-color) !important; border-color: var(--border-color) !important; } @@ -86,15 +86,26 @@ input:focus, textarea:focus, select:focus { box-shadow: 0 0 5px var(--shadow-color); } +.bg-light{ + background-color: var(--background-color) !important; +} + /* Navigation (Background and Text Colors) */ .navbar, .navbar-light, .navbar-dark { - background-color: var(--primary-color) !important; + background-color: var(--background-color) !important; color: var(--button-text-color) !important; } + .navbar a { color: var(--button-text-color) !important; } +.navbar .dropdown-item a { + color: var(--background-color) !important; +} + + + /* Tables (Borders and Header Colors) */ th, td { border: 1px solid var(--border-color); @@ -116,20 +127,18 @@ h1, h2 { color: var(--text-color); } +/* Dark Mode Adjustments (Background and Text Colors) */ @media (prefers-color-scheme: dark) { h1, h2 { color: #ffffff !important; text-shadow: 2px 2px 5px rgba(255, 255, 255, 0.3); } -} - -/* Dark Mode Adjustments (Background and Text Colors) */ -@media (prefers-color-scheme: dark) { body { background-color: var(--background-dark-color) !important; color: var(--text-color) !important; } input, textarea, select { + color: var(--button-text-color) !important; background-color: var(--background-dark-color) !important; color: var(--text-color) !important; } @@ -153,12 +162,6 @@ h1, h2 { background-color: var(--secondary-color) !important; color: var(--text-color) !important; } - -/* Portfolio Specific: Input Field Text Color */ -#dynamicModalContent { - color: var(--button-text-color) !important; -} - /* Ensure the button itself uses the light text color. Occured in Mastodon */ button.icon-button { color: var(--button-text-color) !important; diff --git a/roles/nginx-global-css/templates/link.j2 b/roles/nginx-global-css/templates/link.j2 new file mode 100644 index 00000000..dc1b15c7 --- /dev/null +++ b/roles/nginx-global-css/templates/link.j2 @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/roles/nginx-global-css/templates/sub_filter.conf.j2 b/roles/nginx-global-css/templates/sub_filter.conf.j2 deleted file mode 100644 index c1bb5619..00000000 --- a/roles/nginx-global-css/templates/sub_filter.conf.j2 +++ /dev/null @@ -1 +0,0 @@ -sub_filter '' ''; \ No newline at end of file diff --git a/roles/nginx-global-matomo/templates/matomo-tracking.conf.j2 b/roles/nginx-global-matomo/templates/matomo-tracking.conf.j2 index 29fd7a06..1da2ddee 100644 --- a/roles/nginx-global-matomo/templates/matomo-tracking.conf.j2 +++ b/roles/nginx-global-matomo/templates/matomo-tracking.conf.j2 @@ -2,5 +2,4 @@ add_header Content-Security-Policy: ""; # sub filters to integrate matomo tracking code in nginx websites -sub_filter '' ''; sub_filter '' ''; \ No newline at end of file diff --git a/roles/nginx-global-matomo/templates/script.j2 b/roles/nginx-global-matomo/templates/script.j2 new file mode 100644 index 00000000..42b24262 --- /dev/null +++ b/roles/nginx-global-matomo/templates/script.j2 @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/roles/nginx-global/templates/global.includes.conf.j2 b/roles/nginx-global/templates/global.includes.conf.j2 index fec07ead..49e6c2cb 100644 --- a/roles/nginx-global/templates/global.includes.conf.j2 +++ b/roles/nginx-global/templates/global.includes.conf.j2 @@ -7,9 +7,11 @@ sub_filter_types text/html; {% include 'roles/nginx-global-matomo/templates/matomo-tracking.conf.j2' %} {% endif %} +{% if global_theming_enabled | bool or global_matomo_tracking_enabled | bool%} + sub_filter '' '{% if global_matomo_tracking_enabled | bool %}{% include 'roles/nginx-global-matomo/templates/script.j2' %}{% endif %}{% if global_theming_enabled | bool %}{% include 'roles/nginx-global-css/templates/link.j2' %}{% endif %}'; +{% endif %} + {% if global_theming_enabled | bool %} - # Include Global Theming - {% include 'roles/nginx-global-css/templates/sub_filter.conf.j2' %} # Include Global CSS Location {% include 'roles/nginx-global-css/templates/location.conf.j2' %} {% endif %}