diff --git a/src/app/_layout/app-header/_app-header-theme.scss b/src/app/_layout/app-header/_app-header-theme.scss index 046d393f3..604d21c03 100644 --- a/src/app/_layout/app-header/_app-header-theme.scss +++ b/src/app/_layout/app-header/_app-header-theme.scss @@ -7,10 +7,11 @@ .header { mat-toolbar { - background-color: mat.m2-get-color-from-palette($primary, "darker"); + background-color: mat.m2-get-color-from-palette($primary, "default-contrast"); + border-bottom: 2px solid mat.m2-get-color-from-palette($primary, "default"); } - a { - color: mat.m2-get-color-from-palette($primary, "default-contrast"); + a, h3, div { + color: mat.m2-get-color-from-palette($primary, "default"); } } } diff --git a/src/app/_layout/app-header/app-header.component.html b/src/app/_layout/app-header/app-header.component.html index c19064f56..78c0efe66 100644 --- a/src/app/_layout/app-header/app-header.component.html +++ b/src/app/_layout/app-header/app-header.component.html @@ -1,5 +1,5 @@
- + + + @@ -111,7 +128,7 @@
diff --git a/src/app/_layout/app-header/app-header.component.scss b/src/app/_layout/app-header/app-header.component.scss index 1e4dd4f46..9a751f1d6 100644 --- a/src/app/_layout/app-header/app-header.component.scss +++ b/src/app/_layout/app-header/app-header.component.scss @@ -7,7 +7,7 @@ mat-toolbar { height: 3.5rem; - a { + a, .main-menu { height: 2.5rem; padding: 0.5rem; @@ -16,11 +16,19 @@ margin-right: 0.5rem; } } + .main-menu mat-icon { + font-size: 32px; + padding-top: 5px; + } - .spacer { + .spacer, .title { flex: 1 1 auto; } + .title h3 { + text-align: center; + } + .toplink { padding: 0.5rem 1rem; font: bold; diff --git a/src/app/_layout/app-header/app-header.component.ts b/src/app/_layout/app-header/app-header.component.ts index 543e4a6de..fb75a311d 100644 --- a/src/app/_layout/app-header/app-header.component.ts +++ b/src/app/_layout/app-header/app-header.component.ts @@ -24,7 +24,8 @@ import { Router } from "@angular/router"; export class AppHeaderComponent implements OnInit { config = this.appConfigService.getConfig(); facility = this.config.facility ?? ""; - status = this.appConfig.production ? "" : "test"; + siteTitle = this.config.siteTitle ?? "Vanilla SciCat"; + siteSciCatLogo = this.config.siteSciCatLogo == "icon" ? "scicat-header-logo-icon.png" : "scicat-header-logo-full.png"; siteHeaderLogo = this.config.siteHeaderLogo ?? "site-header-logo.png"; oAuth2Endpoints: OAuth2Endpoint[] = []; diff --git a/src/app/app-config.service.ts b/src/app/app-config.service.ts index 0c5a90503..9d3d3f094 100644 --- a/src/app/app-config.service.ts +++ b/src/app/app-config.service.ts @@ -101,6 +101,8 @@ export interface AppConfigInterface { shareEnabled: boolean; shoppingCartEnabled: boolean; shoppingCartOnHeader: boolean; + siteTitle: string | null; + siteSciCatLogo: string | null; siteHeaderLogo: string | null; siteLoginBackground: string | null; siteLoginLogo: string | null; diff --git a/src/app/datasets/dashboard/full-text-search/full-text-search-bar.component.html b/src/app/datasets/dashboard/full-text-search/full-text-search-bar.component.html index c31289539..8c95a1dc8 100644 --- a/src/app/datasets/dashboard/full-text-search/full-text-search-bar.component.html +++ b/src/app/datasets/dashboard/full-text-search/full-text-search-bar.component.html @@ -13,6 +13,16 @@ />
+ -
diff --git a/src/app/datasets/dashboard/full-text-search/full-text-search-bar.component.scss b/src/app/datasets/dashboard/full-text-search/full-text-search-bar.component.scss index 2404756ed..c01453aeb 100644 --- a/src/app/datasets/dashboard/full-text-search/full-text-search-bar.component.scss +++ b/src/app/datasets/dashboard/full-text-search/full-text-search-bar.component.scss @@ -1,6 +1,6 @@ mat-card { padding: 0.4em; - margin: 1.5em 0.5em 0.5em; + margin: 0.5em 0.5em 0.5em; .search-card-container { display: flex; @@ -20,4 +20,5 @@ mat-card { .full-text-clear-button { margin:0 2px; } + } diff --git a/src/app/datasets/datasets-filter/datasets-filter.component.html b/src/app/datasets/datasets-filter/datasets-filter.component.html index 7886cfd33..3f7d8ba37 100644 --- a/src/app/datasets/datasets-filter/datasets-filter.component.html +++ b/src/app/datasets/datasets-filter/datasets-filter.component.html @@ -41,23 +41,23 @@
diff --git a/src/app/shared/modules/breadcrumb/breadcrumb.component.scss b/src/app/shared/modules/breadcrumb/breadcrumb.component.scss index 428fc9406..6868502e7 100644 --- a/src/app/shared/modules/breadcrumb/breadcrumb.component.scss +++ b/src/app/shared/modules/breadcrumb/breadcrumb.component.scss @@ -1,11 +1,11 @@ .breadcrumb { - margin: 1rem 0; + margin: 0.1rem 0; padding-left: 1rem; .container { border-top: 1px solid; border-bottom: 1px solid; - padding: 0.3em 0; + padding: 0.1em 0; .active { font-weight: bold; diff --git a/src/app/state-management/selectors/user.selectors.ts b/src/app/state-management/selectors/user.selectors.ts index 4ec3c4702..b32a9e63e 100644 --- a/src/app/state-management/selectors/user.selectors.ts +++ b/src/app/state-management/selectors/user.selectors.ts @@ -40,7 +40,7 @@ export const selectThumbnailPhoto = createSelector(selectProfile, (profile) => { return profile.thumbnailPhoto; } - return "assets/images/user.png"; + return "assets/images/user_main_color.png"; }); export const selectIsAdmin = createSelector( diff --git a/src/assets/config.json b/src/assets/config.json index f97e7cc9e..1b7dee759 100644 --- a/src/assets/config.json +++ b/src/assets/config.json @@ -11,6 +11,8 @@ "externalAuthEndpoint": "/auth/msad", "facility": "Local", "siteIcon": "site-header-logo.png", + "sitetitle" : "", + "siteSciCatLogo" : "", "loginFacilityLabel": "ESS", "loginLdapLabel": "Ldap", "loginLocalLabel": "Local", diff --git a/src/assets/images/scicat-header-logo.png b/src/assets/images/scicat-header-logo-full.png similarity index 100% rename from src/assets/images/scicat-header-logo.png rename to src/assets/images/scicat-header-logo-full.png diff --git a/src/assets/images/scicat-header-logo-icon.png b/src/assets/images/scicat-header-logo-icon.png new file mode 100644 index 000000000..a86129237 Binary files /dev/null and b/src/assets/images/scicat-header-logo-icon.png differ diff --git a/src/assets/images/user_main_color.png b/src/assets/images/user_main_color.png new file mode 100644 index 000000000..b4ebb1781 Binary files /dev/null and b/src/assets/images/user_main_color.png differ