diff --git a/datamodels/2.x/itop-portal-base/portal/web/css/bootstrap-theme-combodo.css b/datamodels/2.x/itop-portal-base/portal/web/css/bootstrap-theme-combodo.css index 8af9b88573..cad9556029 100644 --- a/datamodels/2.x/itop-portal-base/portal/web/css/bootstrap-theme-combodo.css +++ b/datamodels/2.x/itop-portal-base/portal/web/css/bootstrap-theme-combodo.css @@ -1132,7 +1132,7 @@ th { background-color: #fdf5d0; } .table-hover > tbody > tr:hover { - background-color: #f5f5f5; + background-color: #fdf5d0; } table col[class*="col-"] { position: static; @@ -4954,6 +4954,16 @@ label { color: #fff; background-color: #ea7d1e; } +/* Overriding DataTable */ +table.dataTable tbody > tr.selected, table.dataTable tbody > tr > .selected { + background-color: #fbeb9f; +} +table.dataTable tbody tr.selected, table.dataTable tbody th.selected, table.dataTable tbody td.selected { + color: #777; +} +table.dataTable tbody tr.selected a, table.dataTable tbody th.selected a, table.dataTable tbody td.selected a { + color: #da7014; +} /* Form display modes */ @media (min-width: 768px) { /* Compact mode */ diff --git a/datamodels/2.x/itop-portal-base/portal/web/css/bootstrap-theme-combodo.scss b/datamodels/2.x/itop-portal-base/portal/web/css/bootstrap-theme-combodo.scss index 9bfe05062f..f67d9ba9e7 100644 --- a/datamodels/2.x/itop-portal-base/portal/web/css/bootstrap-theme-combodo.scss +++ b/datamodels/2.x/itop-portal-base/portal/web/css/bootstrap-theme-combodo.scss @@ -1361,13 +1361,13 @@ th { border-bottom-width: 2px } .table-striped>tbody>tr:nth-of-type(odd) { - background-color: #f9f9f9 + background-color: $table-bg-accent; } .table-striped>tbody>tr:hover { - background-color: #fdf5d0; + background-color: $table-bg-hover; } .table-hover>tbody>tr:hover { - background-color: #f5f5f5 + background-color: $table-bg-hover; } table col[class*="col-"] { position: static; @@ -6043,6 +6043,25 @@ label { color: $btn-primary-color; background-color: $btn-primary-bg; } +/* Overriding DataTable */ +table.dataTable{ + tbody{ + >tr.selected, + >tr>.selected{ + background-color: $table-bg-active; + } + + tr.selected, + th.selected, + td.selected { + color: $gray; + + a { + color: $link-color; + } + } + } +} /* Form display modes */ @media (min-width: 768px) { .form_field_compact .form-group.form_group_small, diff --git a/datamodels/2.x/itop-portal-base/portal/web/css/variables.scss b/datamodels/2.x/itop-portal-base/portal/web/css/variables.scss index c80648994e..fe69d9085e 100644 --- a/datamodels/2.x/itop-portal-base/portal/web/css/variables.scss +++ b/datamodels/2.x/itop-portal-base/portal/web/css/variables.scss @@ -33,6 +33,8 @@ $brand-info: #029ACF !default; $brand-warning: #9B479F !default; $brand-danger: #D85A1E !default; +$brand-primary-lighter: lighten($brand-primary, 10%) !default; +$brand-primary-light: lighten($brand-primary, 6%) !default; $brand-primary-dark: darken($brand-primary, 6%) !default; $brand-primary-darker: darken($brand-primary, 10%) !default; $brand-default-dark: darken($brand-default, 6%) !default; @@ -158,8 +160,8 @@ $table-bg: transparent !default; //** Background color used for `.table-striped`. $table-bg-accent: #f9f9f9 !default; //** Background color used for `.table-hover`. -$table-bg-hover: #f5f5f5 !default; -$table-bg-active: $table-bg-hover !default; +$table-bg-hover: #fdf5d0 !default; +$table-bg-active: darken($table-bg-hover, 10%) !default; //** Border color for table and cell borders. $table-border-color: #ddd !default;