Merge pull request #1923 from 4Science/CST-6171

Customizability of theme colours
This commit is contained in:
Tim Donohue
2023-01-05 15:00:41 -06:00
committed by GitHub
7 changed files with 50 additions and 13 deletions

View File

@@ -1,5 +1,5 @@
nav.navbar {
border-bottom: 1px var(--bs-gray-400) solid;
border-bottom: 1px var(--ds-header-navbar-border-bottom-color) solid;
align-items: baseline;
}

View File

@@ -55,34 +55,34 @@ describe('MyDSpaceItemStatusComponent', () => {
component.status = MyDspaceItemStatusType.VALIDATION;
fixture.detectChanges();
expect(component.badgeContent).toBe(MyDspaceItemStatusType.VALIDATION);
expect(component.badgeClass).toBe('text-light badge badge-warning');
expect(component.badgeClass).toBe('text-light badge badge-validation');
});
it('should init badge content and class', () => {
component.status = MyDspaceItemStatusType.WAITING_CONTROLLER;
fixture.detectChanges();
expect(component.badgeContent).toBe(MyDspaceItemStatusType.WAITING_CONTROLLER);
expect(component.badgeClass).toBe('text-light badge badge-info');
expect(component.badgeClass).toBe('text-light badge badge-waiting-controller');
});
it('should init badge content and class', () => {
component.status = MyDspaceItemStatusType.WORKSPACE;
fixture.detectChanges();
expect(component.badgeContent).toBe(MyDspaceItemStatusType.WORKSPACE);
expect(component.badgeClass).toBe('text-light badge badge-primary');
expect(component.badgeClass).toBe('text-light badge badge-workspace');
});
it('should init badge content and class', () => {
component.status = MyDspaceItemStatusType.ARCHIVED;
fixture.detectChanges();
expect(component.badgeContent).toBe(MyDspaceItemStatusType.ARCHIVED);
expect(component.badgeClass).toBe('text-light badge badge-success');
expect(component.badgeClass).toBe('text-light badge badge-archived');
});
it('should init badge content and class', () => {
component.status = MyDspaceItemStatusType.WORKFLOW;
fixture.detectChanges();
expect(component.badgeContent).toBe(MyDspaceItemStatusType.WORKFLOW);
expect(component.badgeClass).toBe('text-light badge badge-info');
expect(component.badgeClass).toBe('text-light badge badge-workflow');
});
});

View File

@@ -34,19 +34,19 @@ export class MyDSpaceItemStatusComponent implements OnInit {
this.badgeClass = 'text-light badge ';
switch (this.status) {
case MyDspaceItemStatusType.VALIDATION:
this.badgeClass += 'badge-warning';
this.badgeClass += 'badge-validation';
break;
case MyDspaceItemStatusType.WAITING_CONTROLLER:
this.badgeClass += 'badge-info';
this.badgeClass += 'badge-waiting-controller';
break;
case MyDspaceItemStatusType.WORKSPACE:
this.badgeClass += 'badge-primary';
this.badgeClass += 'badge-workspace';
break;
case MyDspaceItemStatusType.ARCHIVED:
this.badgeClass += 'badge-success';
this.badgeClass += 'badge-archived';
break;
case MyDspaceItemStatusType.WORKFLOW:
this.badgeClass += 'badge-info';
this.badgeClass += 'badge-workflow';
break;
}
}