stylistic tweaks

- change tab style back to pills to match staff catalog
- add some padding

TODO: fix grey background of entire page

Signed-off-by: Galen Charlton <gmc@equinoxinitiative.org>

diff --git a/Open-ILS/src/eg2/src/app/staff/acq/search/acq-search-form.component.css b/Open-ILS/src/eg2/src/app/staff/acq/search/acq-search-form.component.css
new file mode 100644 (file)
index 0000000..8842d11
--- /dev/null
+++ b/Open-ILS/src/eg2/src/app/staff/acq/search/acq-search-form.component.css
@@ -0,0 +1,5 @@
+#acq-search-form {
+  border-radius: 0px 0px 7px 7px;
+  background-color: rgb(247, 247, 247);
+  box-shadow: 1px 2px 3px -1px rgba(0, 0, 0, .2);
+}

diff --git a/Open-ILS/src/eg2/src/app/staff/acq/search/acq-search-form.component.html b/Open-ILS/src/eg2/src/app/staff/acq/search/acq-search-form.component.html
index 0fe01b2..3138a5f 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/acq/search/acq-search-form.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/acq/search/acq-search-form.component.html
@@ -1,4 +1,5 @@
-<div class="row" *ngFor="let t of searchTerms; let idx=index">
+<div id="acq-search-form" class="pl-3 pr-3 pt-3 pb-3">
+<div class="row mb-1" *ngFor="let t of searchTerms; let idx=index">
   <div class="col-lg-3">
     <select class="form-control" id="selected-search-term" [ngModelOptions]="{standalone: true}" [(ngModel)]="t.field"
       (change)="clearSearchTerm(t)">
@@ -60,3 +61,4 @@
     <button class="form-control btn-success" (click)="submitSearch()" i18n>Search</button>
   </div>
 </div>
+</div>

diff --git a/Open-ILS/src/eg2/src/app/staff/acq/search/acq-search-form.component.ts b/Open-ILS/src/eg2/src/app/staff/acq/search/acq-search-form.component.ts
index 4816ab4..f1e9623 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/acq/search/acq-search-form.component.ts
+++ b/Open-ILS/src/eg2/src/app/staff/acq/search/acq-search-form.component.ts
@@ -8,6 +8,7 @@ import {AcqSearchTerm} from './acq-search.service';
 
 @Component({
   selector: 'eg-acq-search-form',
+  styleUrls: ['acq-search-form.component.css'],
   templateUrl: './acq-search-form.component.html'
 })
 

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
new file mode 100644 (file)
index 0000000..efa268b
--- /dev/null
+++ b/Open-ILS/src/eg2/src/app/staff/acq/search/acq-search.component.css
@@ -0,0 +1,3 @@
+#acq-search-page {
+    background-color: rgb(247, 247, 247);
+}

diff --git a/Open-ILS/src/eg2/src/app/staff/acq/search/acq-search.component.html b/Open-ILS/src/eg2/src/app/staff/acq/search/acq-search.component.html
index d1d43ee..cc2e952 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/acq/search/acq-search.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/acq/search/acq-search.component.html
@@ -4,9 +4,9 @@
 <div class="row">
   <div class="ml-auto mr-3"><a i18n href="/eg/staff/acq/legacy/search/unified">Legacy Search Interface</a></div>
 </div>
-<div class="row">
+<div class="row" id="acq-search-page">
   <div class="col-lg-12">
-    <ngb-tabset #acqSearchTabs [activeId]="searchType" (tabChange)="onTabChange($event)" type="pills">
+    <ngb-tabset #acqSearchTabs [activeId]="searchType" (tabChange)="onTabChange($event)">
       <ngb-tab title="Line Items Search" i18n-title id="lineitems">
         <ng-template ngbTabContent><eg-lineitem-results></eg-lineitem-results></ng-template>
       </ngb-tab>

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 8e3546d..facc6e6 100644 (file)
--- 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,6 +11,7 @@ import {InvoiceResultsComponent} from './invoice-results.component';
 import {PicklistResultsComponent} from './picklist-results.component';
 
 @Component({
+  styleUrls: ['acq-search.component.css'],
   templateUrl: './acq-search.component.html'
 })