Implemented correct loading order

This commit is contained in:
Kevin Veen-Birkenbach 2025-02-07 17:25:53 +01:00
parent 38e031da13
commit 93d2a862c4
6 changed files with 22 additions and 17 deletions

View File

@ -75,9 +75,9 @@ button:hover, .btn:hover {
color: var(--text-color) !important; 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 { 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; color: var(--text-color) !important;
border-color: var(--border-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); box-shadow: 0 0 5px var(--shadow-color);
} }
.bg-light{
background-color: var(--background-color) !important;
}
/* Navigation (Background and Text Colors) */ /* Navigation (Background and Text Colors) */
.navbar, .navbar-light, .navbar-dark { .navbar, .navbar-light, .navbar-dark {
background-color: var(--primary-color) !important; background-color: var(--background-color) !important;
color: var(--button-text-color) !important; color: var(--button-text-color) !important;
} }
.navbar a { .navbar a {
color: var(--button-text-color) !important; color: var(--button-text-color) !important;
} }
.navbar .dropdown-item a {
color: var(--background-color) !important;
}
/* Tables (Borders and Header Colors) */ /* Tables (Borders and Header Colors) */
th, td { th, td {
border: 1px solid var(--border-color); border: 1px solid var(--border-color);
@ -116,20 +127,18 @@ h1, h2 {
color: var(--text-color); color: var(--text-color);
} }
/* Dark Mode Adjustments (Background and Text Colors) */
@media (prefers-color-scheme: dark) { @media (prefers-color-scheme: dark) {
h1, h2 { h1, h2 {
color: #ffffff !important; color: #ffffff !important;
text-shadow: 2px 2px 5px rgba(255, 255, 255, 0.3); text-shadow: 2px 2px 5px rgba(255, 255, 255, 0.3);
} }
}
/* Dark Mode Adjustments (Background and Text Colors) */
@media (prefers-color-scheme: dark) {
body { body {
background-color: var(--background-dark-color) !important; background-color: var(--background-dark-color) !important;
color: var(--text-color) !important; color: var(--text-color) !important;
} }
input, textarea, select { input, textarea, select {
color: var(--button-text-color) !important;
background-color: var(--background-dark-color) !important; background-color: var(--background-dark-color) !important;
color: var(--text-color) !important; color: var(--text-color) !important;
} }
@ -153,12 +162,6 @@ h1, h2 {
background-color: var(--secondary-color) !important; background-color: var(--secondary-color) !important;
color: var(--text-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 */ /* Ensure the button itself uses the light text color. Occured in Mastodon */
button.icon-button { button.icon-button {
color: var(--button-text-color) !important; color: var(--button-text-color) !important;

View File

@ -0,0 +1 @@
<link rel="stylesheet" type="text/css" href="/global.css?version={{global_css_version}}">

View File

@ -1 +0,0 @@
sub_filter '<head>' '<head><link rel="stylesheet" type="text/css" href="/global.css?version={{global_css_version}}">';

View File

@ -2,5 +2,4 @@
add_header Content-Security-Policy: ""; add_header Content-Security-Policy: "";
# sub filters to integrate matomo tracking code in nginx websites # sub filters to integrate matomo tracking code in nginx websites
sub_filter '</head>' '<script>{{matomo_tracking_code_one_liner}}</script></head>';
sub_filter '</body>' '<noscript><p><img src="//matomo.{{primary_domain}}/matomo.php?idsite={{matomo_site_id}}&rec=1" style="border:0;" alt="" /></p></noscript></body>'; sub_filter '</body>' '<noscript><p><img src="//matomo.{{primary_domain}}/matomo.php?idsite={{matomo_site_id}}&rec=1" style="border:0;" alt="" /></p></noscript></body>';

View File

@ -0,0 +1 @@
<script>{{matomo_tracking_code_one_liner}}</script>

View File

@ -7,9 +7,11 @@ sub_filter_types text/html;
{% include 'roles/nginx-global-matomo/templates/matomo-tracking.conf.j2' %} {% include 'roles/nginx-global-matomo/templates/matomo-tracking.conf.j2' %}
{% endif %} {% endif %}
{% if global_theming_enabled | bool or global_matomo_tracking_enabled | bool%}
sub_filter '</head>' '{% 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 %}</head>';
{% endif %}
{% if global_theming_enabled | bool %} {% if global_theming_enabled | bool %}
# Include Global Theming
{% include 'roles/nginx-global-css/templates/sub_filter.conf.j2' %}
# Include Global CSS Location # Include Global CSS Location
{% include 'roles/nginx-global-css/templates/location.conf.j2' %} {% include 'roles/nginx-global-css/templates/location.conf.j2' %}
{% endif %} {% endif %}