From 7711938f4be66358d0b23a6fbb3a2d786845f846 Mon Sep 17 00:00:00 2001 From: Godfrey M Date: Mon, 1 May 2023 16:27:21 -0700 Subject: [PATCH 1/9] fixes dark yellow --- resources/assets/less/skins/skin-yellow-dark.less | 12 +++++------- resources/views/partials/bootstrap-table.blade.php | 6 +++--- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/resources/assets/less/skins/skin-yellow-dark.less b/resources/assets/less/skins/skin-yellow-dark.less index 99678e7743..2718eb638b 100644 --- a/resources/assets/less/skins/skin-yellow-dark.less +++ b/resources/assets/less/skins/skin-yellow-dark.less @@ -52,7 +52,6 @@ } .btn, .btn:hover { - color: #000; &.btn-primary, .btn-primary:link { background-color: var(--button-default); @@ -60,7 +59,6 @@ color: #545454; } - &a.btn-primary:hover { background-color: var(--button-hover); border-color: var(--button-hover); @@ -77,6 +75,9 @@ color: #545454; } } +a.actions { + color:#fff !important; +} /** The dropdown is white, so use a darker color @@ -165,7 +166,7 @@ a.btn.btn-default{ color:var(--nav-link); } .bootstrap-table .fixed-table-container .table thead th .sortable { - color: var(--nav-link); + color: var(--text-main); } .bootstrap-table .fixed-table-toolbar .columns label { color:#000; @@ -355,12 +356,9 @@ input[type=text], input[type=search] { .skin-yellow-dark .main-header .navbar .dropdown-menu li a { color: var(--header); } -div.th-inner{ +tr th div.th-inner { color:var(--text-main); } -.fixed-table-body thead th .th-inner, .skin-yellow-dark, .skin-yellow { - background-color: var(--header)!important; -} .tab-content, .tab-pane { background-color: var(--back-main); color: var(--text-main); diff --git a/resources/views/partials/bootstrap-table.blade.php b/resources/views/partials/bootstrap-table.blade.php index 21a4f29349..03a574eb81 100644 --- a/resources/views/partials/bootstrap-table.blade.php +++ b/resources/views/partials/bootstrap-table.blade.php @@ -261,16 +261,16 @@ } if ((row.available_actions) && (row.available_actions.clone === true)) { - actions += 'Clone '; + actions += 'Clone '; } if ((row.available_actions) && (row.available_actions.update === true)) { - actions += '{{ trans('general.update') }} '; + actions += '{{ trans('general.update') }} '; } if ((row.available_actions) && (row.available_actions.delete === true)) { actions += '' From 47370da924dd2a3ac7ad48f72daf33a9eb1e3ccb Mon Sep 17 00:00:00 2001 From: Godfrey M Date: Tue, 2 May 2023 11:08:37 -0700 Subject: [PATCH 2/9] adds fixes to dark black theme --- .../assets/less/skins/skin-black-dark.less | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/resources/assets/less/skins/skin-black-dark.less b/resources/assets/less/skins/skin-black-dark.less index e914d2c0a4..69a393e80d 100644 --- a/resources/assets/less/skins/skin-black-dark.less +++ b/resources/assets/less/skins/skin-black-dark.less @@ -135,6 +135,9 @@ a { #ldapad_test_results.well.well-sm{ color: var(--back-main); } +a.actions { + color:#fff !important; +} //pagination .pagination > li >a{ color: var(--light-link); @@ -147,6 +150,23 @@ a { .pagination > .active > a:hover{ background-color: var(--hover-link); } +.tasks-menu > .dropdown-menu > li .menu > li > a:hover .progress{ + background-color: var(--background); +} +a:hover > h2.task_menu{ + color:var(--header); +} +h2.task_menu{ + color:var(--link); +} +.navbar-custom-menu > .navbar-nav > li > .dropdown-menu{ + background-color:var(--back-main); + color:var(--link); +} +.navbar-custom-menu > .navbar-nav > li > .dropdown-menu > li.header{ + background-color:var(--header); + color:var(--link); +} .main-header .navbar, .main-header .logo { background-color: var(--header); From 5de30db0a93bfb2d6e33512d53d05974dac59d95 Mon Sep 17 00:00:00 2001 From: Godfrey M Date: Tue, 2 May 2023 12:10:55 -0700 Subject: [PATCH 3/9] fixes dark green theme --- resources/assets/less/skins/skin-green-dark.less | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/resources/assets/less/skins/skin-green-dark.less b/resources/assets/less/skins/skin-green-dark.less index 518146cdb0..a69f918acf 100644 --- a/resources/assets/less/skins/skin-green-dark.less +++ b/resources/assets/less/skins/skin-green-dark.less @@ -131,6 +131,9 @@ a { #ldapad_test_results.well.well-sm{ color: var(--back-main); } +a.actions { + color:#fff !important; +} //pagination .pagination > li >a{ color: var(--light-link); @@ -180,10 +183,6 @@ h2.task_menu{ color: var(--text-main); } -a:link { - color: var(--link); -} - .btn-primary.hover { color: var(--nav-link); } @@ -385,6 +384,12 @@ a { color: var(--visited-link) } } +#customFieldsTable a[href*='/models'] { + color: var(--back-sub); +} +#customFieldsTable a[href*='/fieldsets']{ + background-color: transparent; +} .row-striped { vertical-align: top; From af2f2882865b25d02cef9f0bdedeadc2e27f1206 Mon Sep 17 00:00:00 2001 From: Godfrey M Date: Tue, 2 May 2023 12:17:22 -0700 Subject: [PATCH 4/9] fixes dark orange theme --- resources/assets/less/skins/skin-orange-dark.less | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/resources/assets/less/skins/skin-orange-dark.less b/resources/assets/less/skins/skin-orange-dark.less index bd1386d1eb..98925b475e 100644 --- a/resources/assets/less/skins/skin-orange-dark.less +++ b/resources/assets/less/skins/skin-orange-dark.less @@ -119,6 +119,9 @@ li.dropdown-item-marker { #ldapad_test_results.well.well-sm{ color: var(--back-main); } +a.actions { + color:#fff !important; +} //pagination .pagination > li >a{ color: var(--light-link); @@ -378,6 +381,12 @@ input[type=text], input[type=search] { .box-header.with-border { border-bottom: #000; } +#customFieldsTable a[href*='/models'] { + color: var(--back-sub); +} +#customFieldsTable a[href*='/fieldsets']{ + background-color: transparent; +} .row-striped { vertical-align: top; From f91e76e0f2834ac601e12041d0a9d34f00c16ffd Mon Sep 17 00:00:00 2001 From: Godfrey M Date: Tue, 2 May 2023 12:33:40 -0700 Subject: [PATCH 5/9] fixes dark blue and btn-warning bg --- resources/assets/less/overrides.less | 9 ++++++--- resources/assets/less/skins/skin-blue-dark.less | 9 +++++++++ 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/resources/assets/less/overrides.less b/resources/assets/less/overrides.less index 60a75358fb..e8dc67ce3d 100644 --- a/resources/assets/less/overrides.less +++ b/resources/assets/less/overrides.less @@ -195,6 +195,9 @@ a.accordion-header { .btn-info.btn-outline { color: #5bc0de; } +.btn-warning{ + background-color:#f39c12 !important; +} .btn-warning.btn-outline { color: #f0ad4e; @@ -499,14 +502,14 @@ h4 { background: #FFFFFF; border-top: 1px solid #dddddd; display: table-row; - + } .row-new-striped > .row:nth-of-type(odd) { background-color: #F8F8F8; border-top: 1px solid #dddddd; display: table-row; - + } .row-new-striped div { @@ -740,7 +743,7 @@ input[type="checkbox"] { input[type="checkbox"]::before { -/** If you want to use the non-checkbox, filled square, use this instead **/ + /** If you want to use the non-checkbox, filled square, use this instead **/ content: ""; width: 1em; height: 1em; diff --git a/resources/assets/less/skins/skin-blue-dark.less b/resources/assets/less/skins/skin-blue-dark.less index e886b24f9b..6c502b1781 100644 --- a/resources/assets/less/skins/skin-blue-dark.less +++ b/resources/assets/less/skins/skin-blue-dark.less @@ -132,6 +132,9 @@ a { #ldapad_test_results.well.well-sm{ color: var(--back-main); } +a.actions { + color:#fff !important; +} //pagination .pagination > li >a{ color: var(--light-link); @@ -394,6 +397,12 @@ a { color: var(--visited-link) } } +#customFieldsTable a[href*='/models'] { + color: var(--back-sub); +} +#customFieldsTable a[href*='/fieldsets']{ + background-color: transparent; +} .row-striped { vertical-align: top; From 0a3cb5286d8ed4d21c7a074e614a7796579a308f Mon Sep 17 00:00:00 2001 From: Godfrey M Date: Tue, 2 May 2023 12:37:05 -0700 Subject: [PATCH 6/9] fixes dark red --- resources/assets/less/skins/skin-red-dark.less | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/resources/assets/less/skins/skin-red-dark.less b/resources/assets/less/skins/skin-red-dark.less index dbb0023699..f78da63d8b 100644 --- a/resources/assets/less/skins/skin-red-dark.less +++ b/resources/assets/less/skins/skin-red-dark.less @@ -134,6 +134,9 @@ a { #ldapad_test_results.well.well-sm{ color: var(--back-main); } +a.actions { + color:#fff !important; +} //pagination .pagination > li >a{ color: var(--light-link); @@ -403,7 +406,12 @@ a { color: var(--visited-link) } } - +#customFieldsTable a[href*='/models'] { + color: var(--back-sub); +} +#customFieldsTable a[href*='/fieldsets']{ + background-color: transparent; +} .row-striped { vertical-align: top; line-height: 2.6; From 786e8deb91045aabbfc499dfd87a9b31c03cd2e7 Mon Sep 17 00:00:00 2001 From: Godfrey M Date: Tue, 2 May 2023 13:54:14 -0700 Subject: [PATCH 7/9] removed dead space --- resources/assets/less/skins/skin-red-dark.less | 2 -- 1 file changed, 2 deletions(-) diff --git a/resources/assets/less/skins/skin-red-dark.less b/resources/assets/less/skins/skin-red-dark.less index f78da63d8b..93d88fef54 100644 --- a/resources/assets/less/skins/skin-red-dark.less +++ b/resources/assets/less/skins/skin-red-dark.less @@ -58,8 +58,6 @@ } } - - .btn, .btn:hover { color: #fff; From 1d494252ef832e135f307e5ac0d164a6ab5b55e8 Mon Sep 17 00:00:00 2001 From: Godfrey M Date: Tue, 2 May 2023 14:05:29 -0700 Subject: [PATCH 8/9] corrections for dark red --- .../assets/less/skins/skin-red-dark.less | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/resources/assets/less/skins/skin-red-dark.less b/resources/assets/less/skins/skin-red-dark.less index 93d88fef54..18748492e7 100644 --- a/resources/assets/less/skins/skin-red-dark.less +++ b/resources/assets/less/skins/skin-red-dark.less @@ -132,9 +132,7 @@ a { #ldapad_test_results.well.well-sm{ color: var(--back-main); } -a.actions { - color:#fff !important; -} + //pagination .pagination > li >a{ color: var(--light-link); @@ -187,14 +185,12 @@ h2.task_menu{ a:link { color: var(--link); } - -a:visited { - color: var(--nav-link); -} - a:hover { color: var(--hover-link); } +a:visited { + color: var(--nav-link); +} .far fa-life-ring{ color:var(--link); } @@ -395,13 +391,14 @@ a { color: var(--link); &:link { - color: var(--link) } + color: var(--nav-link); + } &:hover { - color: var(--hover-link); + color: var(--nav-link); text-decoration: underline; } &:visited { - color: var(--visited-link) + color: var(--nav-link); } } #customFieldsTable a[href*='/models'] { From 87d1a82e35d7bb9a78a7e8ed9cbb97aba0bdb20a Mon Sep 17 00:00:00 2001 From: Godfrey M Date: Tue, 2 May 2023 15:15:02 -0700 Subject: [PATCH 9/9] moar changes to red --- resources/assets/less/skins/skin-red-dark.less | 1 - 1 file changed, 1 deletion(-) diff --git a/resources/assets/less/skins/skin-red-dark.less b/resources/assets/less/skins/skin-red-dark.less index 18748492e7..8d75bbc792 100644 --- a/resources/assets/less/skins/skin-red-dark.less +++ b/resources/assets/less/skins/skin-red-dark.less @@ -377,7 +377,6 @@ input[type=text], input[type=search] { } .table-striped>tbody>tr:nth-of-type(even){ background-color: var(--back-sub-alt); - color: var(--text-alt); } #webui>div>div>div>div>div>table>tbody>tr>td>a>i.fa, .box-body, .box-footer, .box-header { color: var(--text-main);