From e960db6e2da3b5b03f1b59df4fdbf9afb15e1198 Mon Sep 17 00:00:00 2001 From: abarrau Date: Tue, 19 Dec 2023 10:56:23 +0100 Subject: [PATCH 1/2] standardize get_theme() function --- application/views/qso/edit_ajax.php | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/application/views/qso/edit_ajax.php b/application/views/qso/edit_ajax.php index 21533f85..737d40e8 100644 --- a/application/views/qso/edit_ajax.php +++ b/application/views/qso/edit_ajax.php @@ -4,14 +4,10 @@ - session->userdata('user_stylesheet')) { ?> - + optionslib->get_theme()) { ?> + - - - - - + From 52beb3b3fff29d52e9ef307d498a95e14c8dad3f Mon Sep 17 00:00:00 2001 From: abarrau Date: Tue, 19 Dec 2023 10:56:49 +0100 Subject: [PATCH 2/2] fix arrow select list not display on dark theme --- assets/css/cyborg/overrides.css | 4 ++++ assets/css/cyborg_wide/overrides.css | 4 ++++ assets/css/darkly/overrides.css | 4 ++++ assets/css/darkly_wide/overrides.css | 4 ++++ assets/css/superhero/overrides.css | 4 ++++ assets/css/superhero_wide/overrides.css | 4 ++++ 6 files changed, 24 insertions(+) diff --git a/assets/css/cyborg/overrides.css b/assets/css/cyborg/overrides.css index 47d0475c..724e3a93 100644 --- a/assets/css/cyborg/overrides.css +++ b/assets/css/cyborg/overrides.css @@ -101,6 +101,9 @@ path.grid-worked { color: #eeeeee; border: 1px solid #333; } +.form-select { + --bs-form-select-bg-img: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16'%3e%3cpath fill='none' stroke='%23FFFFFF' stroke-linecap='round' stroke-linejoin='round' stroke-width='2' d='m2 5 6 6 6-6'/%3e%3c/svg%3e"); +} .bootstrap-dialog.type-primary .modal-header { background-color: #131313; @@ -184,6 +187,7 @@ path.grid-worked { --bs-accordion-btn-focus-border-color: #FFFFFF; --bs-accordion-btn-focus-box-shadow: initial; --bs-accordion-border-color: #2c2c2c; + --bs-accordion-btn-active-icon: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16' fill='%23FFFFFF'%3e%3cpath fill-rule='evenodd' d='M1.646 4.646a.5.5 0 0 1 .708 0L8 10.293l5.646-5.647a.5.5 0 0 1 .708.708l-6 6a.5.5 0 0 1-.708 0l-6-6a.5.5 0 0 1 0-.708z'/%3e%3c/svg%3e"); } .accordion-button.collapsed { border-bottom: 1px solid var(--bs-body-bg); diff --git a/assets/css/cyborg_wide/overrides.css b/assets/css/cyborg_wide/overrides.css index 5051981d..b858a186 100644 --- a/assets/css/cyborg_wide/overrides.css +++ b/assets/css/cyborg_wide/overrides.css @@ -101,6 +101,9 @@ path.grid-worked { color: #eeeeee; border: 1px solid #333; } +.form-select { + --bs-form-select-bg-img: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16'%3e%3cpath fill='none' stroke='%23FFFFFF' stroke-linecap='round' stroke-linejoin='round' stroke-width='2' d='m2 5 6 6 6-6'/%3e%3c/svg%3e"); +} .bootstrap-dialog.type-primary .modal-header { background-color: #131313; @@ -239,6 +242,7 @@ path.grid-worked { --bs-accordion-btn-focus-border-color: #FFFFFF; --bs-accordion-btn-focus-box-shadow: initial; --bs-accordion-border-color: #2c2c2c; + --bs-accordion-btn-active-icon: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16' fill='%23FFFFFF'%3e%3cpath fill-rule='evenodd' d='M1.646 4.646a.5.5 0 0 1 .708 0L8 10.293l5.646-5.647a.5.5 0 0 1 .708.708l-6 6a.5.5 0 0 1-.708 0l-6-6a.5.5 0 0 1 0-.708z'/%3e%3c/svg%3e"); } .accordion-button.collapsed { border-bottom: 1px solid var(--bs-body-bg); diff --git a/assets/css/darkly/overrides.css b/assets/css/darkly/overrides.css index a5cf98bf..94e102fb 100644 --- a/assets/css/darkly/overrides.css +++ b/assets/css/darkly/overrides.css @@ -115,6 +115,9 @@ path.grid-worked { background-color: rgba(20, 20, 20, 0.5); color: #eee; } +.form-select { + --bs-form-select-bg-img: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16'%3e%3cpath fill='none' stroke='%23FFFFFF' stroke-linecap='round' stroke-linejoin='round' stroke-width='2' d='m2 5 6 6 6-6'/%3e%3c/svg%3e"); +} select optgroup, select option { @@ -195,6 +198,7 @@ div.alert-danger { --bs-accordion-btn-bg: #444444; --bs-accordion-active-bg: #444444; --bs-accordion-border-color: #444444; + --bs-accordion-btn-active-icon: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16' fill='%23FFFFFF'%3e%3cpath fill-rule='evenodd' d='M1.646 4.646a.5.5 0 0 1 .708 0L8 10.293l5.646-5.647a.5.5 0 0 1 .708.708l-6 6a.5.5 0 0 1-.708 0l-6-6a.5.5 0 0 1 0-.708z'/%3e%3c/svg%3e"); } .accordion-button.collapsed { border-bottom:1px solid var(--bs-body-bg); diff --git a/assets/css/darkly_wide/overrides.css b/assets/css/darkly_wide/overrides.css index fd50f4b1..99b49e03 100644 --- a/assets/css/darkly_wide/overrides.css +++ b/assets/css/darkly_wide/overrides.css @@ -115,6 +115,9 @@ path.grid-worked { background-color: rgba(20, 20, 20, 0.5); color: #eee; } +.form-select { + --bs-form-select-bg-img: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16'%3e%3cpath fill='none' stroke='%23FFFFFF' stroke-linecap='round' stroke-linejoin='round' stroke-width='2' d='m2 5 6 6 6-6'/%3e%3c/svg%3e"); +} select optgroup, select option { @@ -251,6 +254,7 @@ div.alert-danger { --bs-accordion-btn-bg: #444444; --bs-accordion-active-bg: #444444; --bs-accordion-border-color: #444444; + --bs-accordion-btn-active-icon: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16' fill='%23FFFFFF'%3e%3cpath fill-rule='evenodd' d='M1.646 4.646a.5.5 0 0 1 .708 0L8 10.293l5.646-5.647a.5.5 0 0 1 .708.708l-6 6a.5.5 0 0 1-.708 0l-6-6a.5.5 0 0 1 0-.708z'/%3e%3c/svg%3e"); } .accordion-button.collapsed { border-bottom:1px solid var(--bs-body-bg); diff --git a/assets/css/superhero/overrides.css b/assets/css/superhero/overrides.css index 3f2770a6..0e75c70a 100644 --- a/assets/css/superhero/overrides.css +++ b/assets/css/superhero/overrides.css @@ -104,6 +104,9 @@ path.grid-worked { background-color: rgba(20, 41, 62, 0.6); color: #fff; } +.form-select { + --bs-form-select-bg-img: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16'%3e%3cpath fill='none' stroke='%23FFFFFF' stroke-linecap='round' stroke-linejoin='round' stroke-width='2' d='m2 5 6 6 6-6'/%3e%3c/svg%3e"); +} div.alert-danger { color: #ffffff; @@ -184,6 +187,7 @@ div.alert-danger { --bs-accordion-bg: var(--cl-bg); --bs-accordion-btn-bg: #4e5e6c; --bs-accordion-active-bg: #4e5e6c; + --bs-accordion-btn-active-icon: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16' fill='%23FFFFFF'%3e%3cpath fill-rule='evenodd' d='M1.646 4.646a.5.5 0 0 1 .708 0L8 10.293l5.646-5.647a.5.5 0 0 1 .708.708l-6 6a.5.5 0 0 1-.708 0l-6-6a.5.5 0 0 1 0-.708z'/%3e%3c/svg%3e"); } .accordion-button.collapsed { border-bottom: 1px solid var(--cl-bg); diff --git a/assets/css/superhero_wide/overrides.css b/assets/css/superhero_wide/overrides.css index b3302bb4..8184432a 100644 --- a/assets/css/superhero_wide/overrides.css +++ b/assets/css/superhero_wide/overrides.css @@ -113,6 +113,9 @@ path.grid-worked { .navbar-light .navbar-nav .nav-link:hover { color: #fff; } +.form-select { + --bs-form-select-bg-img: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16'%3e%3cpath fill='none' stroke='%23FFFFFF' stroke-linecap='round' stroke-linejoin='round' stroke-width='2' d='m2 5 6 6 6-6'/%3e%3c/svg%3e"); +} /* Hamburger Menu */ @@ -238,6 +241,7 @@ div.alert-danger { --bs-accordion-bg: var(--cl-bg); --bs-accordion-btn-bg: #4e5e6c; --bs-accordion-active-bg: #4e5e6c; + --bs-accordion-btn-active-icon: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16' fill='%23FFFFFF'%3e%3cpath fill-rule='evenodd' d='M1.646 4.646a.5.5 0 0 1 .708 0L8 10.293l5.646-5.647a.5.5 0 0 1 .708.708l-6 6a.5.5 0 0 1-.708 0l-6-6a.5.5 0 0 1 0-.708z'/%3e%3c/svg%3e"); } .accordion-button.collapsed { border-bottom: 1px solid var(--cl-bg);