From 9ceff36ea9bfd701e8efec063403fcf6afc64074 Mon Sep 17 00:00:00 2001 From: Galen Charlton Date: Sun, 19 Jan 2020 13:58:30 -0500 Subject: [PATCH] alternative way of setting the background of nav-tabs Looks like it needs to be a global style for now. Signed-off-by: Galen Charlton --- .../src/app/staff/acq/search/acq-search.component.css | 3 --- .../src/app/staff/acq/search/acq-search.component.ts | 1 - Open-ILS/src/eg2/src/styles.css | 19 +++++++++++++++++++ 3 files changed, 19 insertions(+), 4 deletions(-) delete mode 100644 Open-ILS/src/eg2/src/app/staff/acq/search/acq-search.component.css diff --git a/Open-ILS/src/eg2/src/app/staff/acq/search/acq-search.component.css b/Open-ILS/src/eg2/src/app/staff/acq/search/acq-search.component.css deleted file mode 100644 index efa268b0ec..0000000000 --- a/Open-ILS/src/eg2/src/app/staff/acq/search/acq-search.component.css +++ /dev/null @@ -1,3 +0,0 @@ -#acq-search-page { - background-color: rgb(247, 247, 247); -} diff --git a/Open-ILS/src/eg2/src/app/staff/acq/search/acq-search.component.ts b/Open-ILS/src/eg2/src/app/staff/acq/search/acq-search.component.ts index facc6e6e4c..8e3546d6b0 100644 --- a/Open-ILS/src/eg2/src/app/staff/acq/search/acq-search.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/acq/search/acq-search.component.ts @@ -11,7 +11,6 @@ import {InvoiceResultsComponent} from './invoice-results.component'; import {PicklistResultsComponent} from './picklist-results.component'; @Component({ - styleUrls: ['acq-search.component.css'], templateUrl: './acq-search.component.html' }) diff --git a/Open-ILS/src/eg2/src/styles.css b/Open-ILS/src/eg2/src/styles.css index ef97e2a93d..fb438973b4 100644 --- a/Open-ILS/src/eg2/src/styles.css +++ b/Open-ILS/src/eg2/src/styles.css @@ -219,3 +219,22 @@ body>.dropdown-menu {z-index: 2100;} background-color: #c9efe4; color: black; } + +/** + * Make the acquisitions search form's navigation tabs match + * those of the staff interface. This is a global rule because + * various approaches to doing it local to the acq search component + * don't work: + * + * 1. A rule bound to the container of the acq search tabset + * would make the entire background be grey. + * 2. ":host ::ng-deep" for a local rule works, but depends on a + * mechanism that is deprecated. + * 4. ng-tabset provides no hooks for custom styles for the nav-tab + * background. + * 5. Turning off view encapsulation for the acq search component + * breaks a lot of styles. + */ +#acq-search-page ngb-tabset .nav.nav-tabs { + background-color: rgb(247, 247, 247); +} -- 2.11.0