diff --git a/admin-dev/themes/default/css/admin-theme.css b/admin-dev/themes/default/css/admin-theme.css index b2277df8a..0511d0e5d 100644 --- a/admin-dev/themes/default/css/admin-theme.css +++ b/admin-dev/themes/default/css/admin-theme.css @@ -3172,14 +3172,14 @@ a.link-social:hover { text-decoration: none; } .bootstrap .table thead > tr > th span.title_box.active { font-weight: bold; } .bootstrap .table thead > tr > th span.title_box a { text-decoration: none; } .bootstrap .table thead > tr > th span.title_box a.active { color: black; } +.bootstrap .table thead > tr.filter > th { background-color: #dfeff8; } +.bootstrap .table thead > tr.filter > th input[type="text"].filter, .bootstrap .table thead > tr.filter > th input[type="password"].filter, .bootstrap .table thead > tr.filter > th select.filter { font-size: 12px; border-color: #a0d0eb; } .bootstrap .table input, .bootstrap .table select { margin: 0; } .bootstrap .table tbody > tr > td { border-top: none; background-color: white; padding: 3px 7px; vertical-align: middle; word-wrap: nowrap; font-size: 12px; border-bottom: solid 1px #eeeeee; } .bootstrap .table tbody > tr.odd > td { background-color: #f9f9f9; } .bootstrap .table tbody > tr:hover > td { background-color: #e6e8e3; } .bootstrap .table td.center, .bootstrap .table th.center { text-align: center; } .bootstrap .table td.pointer { cursor: pointer; } -.bootstrap tr.filter { background-color: #dfeff8; } -.bootstrap tr.filter input[type="text"].filter, .bootstrap tr.filter input[type="password"].filter, .bootstrap tr.filter select.filter { font-size: 12px; border-color: #a0d0eb; } .bootstrap tr.highlighted td { background-color: #1ba6e5 !important; color: white; } .bootstrap td.actions { min-width: 200px; } .bootstrap .bulk-actions { margin: 17px 0 0 0; } diff --git a/admin-dev/themes/default/scss/admin-theme/_admin-tables.sass b/admin-dev/themes/default/scss/admin-theme/_admin-tables.sass index 1a412ae07..9638581fc 100644 --- a/admin-dev/themes/default/scss/admin-theme/_admin-tables.sass +++ b/admin-dev/themes/default/scss/admin-theme/_admin-tables.sass @@ -21,6 +21,11 @@ text-decoration: none a.active color: black + thead > tr.filter > th + background-color: lighten(#CAE5F4,5%) + input[type="text"].filter, input[type="password"].filter, select.filter + font-size: 12px + border-color: darken(#CAE5F4,10%) input, select margin: 0 tbody @@ -42,12 +47,6 @@ td.pointer cursor: pointer -tr.filter - background-color: lighten(#CAE5F4,5%) - input[type="text"].filter, input[type="password"].filter, select.filter - font-size: 12px - border-color: darken(#CAE5F4,10%) - tr.highlighted td background-color: $brand-primary!important color: white diff --git a/admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl index 432c137ce..cd7df8564 100644 --- a/admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl +++ b/admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl @@ -73,7 +73,7 @@
{l s='There is no CSV file available. Please upload one using the \'Upload\' button above.'}