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-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);
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;
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;
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;
diff --git a/resources/assets/less/skins/skin-red-dark.less b/resources/assets/less/skins/skin-red-dark.less
index dbb0023699..8d75bbc792 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;
@@ -134,6 +132,7 @@ a {
#ldapad_test_results.well.well-sm{
color: var(--back-main);
}
+
//pagination
.pagination > li >a{
color: var(--light-link);
@@ -186,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);
}
@@ -380,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);
@@ -394,16 +390,22 @@ 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'] {
+ color: var(--back-sub);
+}
+#customFieldsTable a[href*='/fieldsets']{
+ background-color: transparent;
+}
.row-striped {
vertical-align: top;
line-height: 2.6;
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 5233c4b7e7..0a4ac1b031 100644
--- a/resources/views/partials/bootstrap-table.blade.php
+++ b/resources/views/partials/bootstrap-table.blade.php
@@ -261,11 +261,11 @@
}
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)) {
@@ -277,7 +277,7 @@
}
actions += ''