diff --git a/CHANGELOG.md b/CHANGELOG.md index 6e9f09de..1e306775 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,40 @@ +## [5.22.2](https://github.com/onecx/onecx-portal-ui-libs/compare/v5.22.1...v5.22.2) (2024-11-04) + +### Bug Fixes + +* introduce AuthProxyService to reduce token calls ([#577](https://github.com/onecx/onecx-portal-ui-libs/issues/577)) ([b8bfcd9](https://github.com/onecx/onecx-portal-ui-libs/commit/b8bfcd9cc99d5b115a487426cc51507adccb2ad3)) + +## [5.22.1](https://github.com/onecx/onecx-portal-ui-libs/compare/v5.22.0...v5.22.1) (2024-11-04) + +### Bug Fixes + +* use replaceUrl for first navigate in router connector ([#576](https://github.com/onecx/onecx-portal-ui-libs/issues/576)) ([affdd8c](https://github.com/onecx/onecx-portal-ui-libs/commit/affdd8c54b794bd45b45e0958c9c400d0a9fd5b5)) + +## [5.22.0](https://github.com/onecx/onecx-portal-ui-libs/compare/v5.21.0...v5.22.0) (2024-10-29) + +### Features + +* new menu-inline-border-color variable ([#567](https://github.com/onecx/onecx-portal-ui-libs/issues/567)) ([d1ec231](https://github.com/onecx/onecx-portal-ui-libs/commit/d1ec23169bf4ae63f55715136627fa113ffc411a)) + +### Bug Fixes + +* fixed styling that maximizes dialogs on mobiles ([#561](https://github.com/onecx/onecx-portal-ui-libs/issues/561)) ([48ba214](https://github.com/onecx/onecx-portal-ui-libs/commit/48ba214316bd4719a33adbaeacc9eb8e6f9eeff7)) + +## [5.21.0](https://github.com/onecx/onecx-portal-ui-libs/compare/v5.20.1...v5.21.0) (2024-10-29) + +### Features + +* dialog buttons can receive custom id ([#566](https://github.com/onecx/onecx-portal-ui-libs/issues/566)) ([eb78d52](https://github.com/onecx/onecx-portal-ui-libs/commit/eb78d5230aa9ba270463ff548af510607830e3e5)) + +### Bug Fixes + +* calendar month and date items focusable ([#558](https://github.com/onecx/onecx-portal-ui-libs/issues/558)) ([f624545](https://github.com/onecx/onecx-portal-ui-libs/commit/f62454507182ca84b3bb21d9c0b0ce9311be6040)) +* custom group selection saved, displaying correct columns on page reload, remove clear column group selection ([#562](https://github.com/onecx/onecx-portal-ui-libs/issues/562)) ([0a8d9c1](https://github.com/onecx/onecx-portal-ui-libs/commit/0a8d9c1c3a61fa5a4aff0d7b085c8834ac824580)) +* data-view-controls translations ([#563](https://github.com/onecx/onecx-portal-ui-libs/issues/563)) ([fc25ec2](https://github.com/onecx/onecx-portal-ui-libs/commit/fc25ec214da27c48820340751fda4c548305f397)) +* dialog service right aligned buttons pushed to right ([#565](https://github.com/onecx/onecx-portal-ui-libs/issues/565)) ([9e61f05](https://github.com/onecx/onecx-portal-ui-libs/commit/9e61f055add7aadb737c4ae9ea06533e3e0022fb)) +* panel icon focus visible ([#557](https://github.com/onecx/onecx-portal-ui-libs/issues/557)) ([6b0d34f](https://github.com/onecx/onecx-portal-ui-libs/commit/6b0d34f0125427783892481b60d7cf3d937c31ff)) +* shell translations for MFEs and RCs ([#564](https://github.com/onecx/onecx-portal-ui-libs/issues/564)) ([f5f3ff6](https://github.com/onecx/onecx-portal-ui-libs/commit/f5f3ff64c2a876e4274dc7ed9b0757fe1c1f8684)) + ## [5.20.1](https://github.com/onecx/onecx-portal-ui-libs/compare/v5.20.0...v5.20.1) (2024-10-24) ### Bug Fixes diff --git a/libs/accelerator/package.json b/libs/accelerator/package.json index e385ceac..7c36ec22 100644 --- a/libs/accelerator/package.json +++ b/libs/accelerator/package.json @@ -1,6 +1,6 @@ { "name": "@onecx/accelerator", - "version": "5.20.1", + "version": "5.22.2", "license": "Apache-2.0", "peerDependencies": { "tslib": "^2.6.3", diff --git a/libs/angular-accelerator/package.json b/libs/angular-accelerator/package.json index 50bbf402..6f3d2936 100644 --- a/libs/angular-accelerator/package.json +++ b/libs/angular-accelerator/package.json @@ -1,6 +1,6 @@ { "name": "@onecx/angular-accelerator", - "version": "5.20.1", + "version": "5.22.2", "license": "Apache-2.0", "peerDependencies": { "@angular/common": "^18.0.5", diff --git a/libs/angular-auth/package.json b/libs/angular-auth/package.json index 178d689e..61829ad7 100644 --- a/libs/angular-auth/package.json +++ b/libs/angular-auth/package.json @@ -1,6 +1,6 @@ { "name": "@onecx/angular-auth", - "version": "5.20.1", + "version": "5.22.2", "license": "Apache-2.0", "peerDependencies": { "@angular-architects/module-federation": "^18.0.4", diff --git a/libs/angular-auth/src/lib/angular-auth.module.ts b/libs/angular-auth/src/lib/angular-auth.module.ts index b17c87f6..f5dbd5dd 100644 --- a/libs/angular-auth/src/lib/angular-auth.module.ts +++ b/libs/angular-auth/src/lib/angular-auth.module.ts @@ -6,6 +6,7 @@ import { TokenInterceptor } from './token.interceptor' import { AuthService } from './auth.service' import { AuthServiceWrapper } from './auth-service-wrapper' import { KeycloakAuthService } from './auth_services/keycloak-auth.service' +import { AuthProxyService } from './auth-proxy.service' import { KeycloakService } from 'keycloak-angular' function appInitializer(configService: ConfigurationService, authService: AuthService) { @@ -15,19 +16,38 @@ function appInitializer(configService: ConfigurationService, authService: AuthSe } } -@NgModule({ - imports: [CommonModule], - providers: [ - AuthServiceWrapper, - { provide: HTTP_INTERCEPTORS, useClass: TokenInterceptor, multi: true }, +function provideAuthServices() { + return [AuthServiceWrapper, KeycloakAuthService, KeycloakService] +} + +export function provideAuthService() { + return [ + provideAuthServices(), { provide: APP_INITIALIZER, useFactory: appInitializer, deps: [ConfigurationService, AuthServiceWrapper], multi: true, }, - KeycloakAuthService, - KeycloakService, + ] +} + +export function provideTokenInterceptor() { + return [ + AuthProxyService, + { + provide: HTTP_INTERCEPTORS, + useClass: TokenInterceptor, + multi: true, + }, + ] +} + +@NgModule({ + imports: [CommonModule], + providers: [ + provideTokenInterceptor(), + provideAuthServices(), // Only needed as fallback if shell uses lib version without new auth mechanism ], }) export class AngularAuthModule {} diff --git a/libs/angular-auth/src/lib/auth-proxy.service.ts b/libs/angular-auth/src/lib/auth-proxy.service.ts new file mode 100644 index 00000000..4e72a970 --- /dev/null +++ b/libs/angular-auth/src/lib/auth-proxy.service.ts @@ -0,0 +1,29 @@ +import { Injectable, inject } from '@angular/core' +import './declarations' +import { AuthServiceWrapper } from './auth-service-wrapper' + +@Injectable() +export class AuthProxyService { + authServiceWrapper?: AuthServiceWrapper | null + + getHeaderValues(): Record { + return ( + window.onecxAngularAuth?.authServiceProxy?.v1?.getHeaderValues() ?? + this.authServiceWrapper?.getHeaderValues() ?? + {} + ) + } + + async updateTokenIfNeeded(): Promise { + if (!window.onecxAngularAuth?.authServiceProxy?.v1?.updateTokenIfNeeded) { + console.info('AuthProxyService uses injected fallback.') + this.authServiceWrapper = inject(AuthServiceWrapper, { optional: true }) + await this.authServiceWrapper?.init() + } + return ( + window.onecxAngularAuth?.authServiceProxy?.v1?.updateTokenIfNeeded() ?? + this.authServiceWrapper?.updateTokenIfNeeded() ?? + Promise.reject('No authServiceWrapper provided.') + ) + } +} diff --git a/libs/angular-auth/src/lib/auth-service-wrapper.ts b/libs/angular-auth/src/lib/auth-service-wrapper.ts index 9de6451f..a790ff9a 100644 --- a/libs/angular-auth/src/lib/auth-service-wrapper.ts +++ b/libs/angular-auth/src/lib/auth-service-wrapper.ts @@ -6,6 +6,7 @@ import { Injectable, Injector } from '@angular/core' import { KeycloakAuthService } from './auth_services/keycloak-auth.service' import { loadRemoteModule } from '@angular-architects/module-federation' import { Config } from '@onecx/integration-interface' +import './declarations' @Injectable() export class AuthServiceWrapper { @@ -20,6 +21,16 @@ export class AuthServiceWrapper { this.eventsTopic$ .pipe(filter((e) => e.type === 'authentication#logoutButtonClicked')) .subscribe(() => this.authService?.logout()) + window.onecxAngularAuth ??= {} + window.onecxAngularAuth.authServiceProxy ??= {} + window.onecxAngularAuth.authServiceProxy.v1 ??= { + updateTokenIfNeeded: (): Promise => { + return this.updateTokenIfNeeded() + }, + getHeaderValues: (): Record => { + return this.getHeaderValues() + }, + } } async init(): Promise { await this.configService.isInitialized diff --git a/libs/angular-auth/src/lib/declarations.ts b/libs/angular-auth/src/lib/declarations.ts new file mode 100644 index 00000000..44669029 --- /dev/null +++ b/libs/angular-auth/src/lib/declarations.ts @@ -0,0 +1,14 @@ +declare global { + interface Window { + onecxAngularAuth?: { + authServiceProxy?: { + v1?: { + getHeaderValues: () => Record, + updateTokenIfNeeded: () => Promise + } + } + } + } +} + +export default globalThis \ No newline at end of file diff --git a/libs/angular-auth/src/lib/token.interceptor.ts b/libs/angular-auth/src/lib/token.interceptor.ts index 557f27ee..0b5ed674 100644 --- a/libs/angular-auth/src/lib/token.interceptor.ts +++ b/libs/angular-auth/src/lib/token.interceptor.ts @@ -1,13 +1,13 @@ import { HttpEvent, HttpHandler, HttpInterceptor, HttpRequest } from '@angular/common/http' import { Injectable } from '@angular/core' import { Observable, from, mergeMap } from 'rxjs' -import { AuthServiceWrapper } from './auth-service-wrapper' +import { AuthProxyService } from './auth-proxy.service' const WHITELIST = ['assets'] @Injectable() export class TokenInterceptor implements HttpInterceptor { - constructor(private authService: AuthServiceWrapper) {} + constructor(private authService: AuthProxyService) {} intercept(request: HttpRequest, next: HttpHandler): Observable> { const skip = WHITELIST.some((str) => request.url.includes(str)) diff --git a/libs/angular-integration-interface/package.json b/libs/angular-integration-interface/package.json index e3995c76..310d4a9a 100644 --- a/libs/angular-integration-interface/package.json +++ b/libs/angular-integration-interface/package.json @@ -1,6 +1,6 @@ { "name": "@onecx/angular-integration-interface", - "version": "5.20.1", + "version": "5.22.2", "license": "Apache-2.0", "peerDependencies": { "@angular/core": "^18.0.5", diff --git a/libs/angular-remote-components/package.json b/libs/angular-remote-components/package.json index 39f58522..53e9e65b 100644 --- a/libs/angular-remote-components/package.json +++ b/libs/angular-remote-components/package.json @@ -1,6 +1,6 @@ { "name": "@onecx/angular-remote-components", - "version": "5.20.1", + "version": "5.22.2", "license": "Apache-2.0", "peerDependencies": { "@angular/common": "^18.0.5", diff --git a/libs/angular-testing/package.json b/libs/angular-testing/package.json index 94a3cba7..d0a785c3 100644 --- a/libs/angular-testing/package.json +++ b/libs/angular-testing/package.json @@ -1,6 +1,6 @@ { "name": "@onecx/angular-testing", - "version": "5.20.1", + "version": "5.22.2", "license": "Apache-2.0", "peerDependencies": { "@angular/cdk": "^18.0.5", diff --git a/libs/angular-webcomponents/package.json b/libs/angular-webcomponents/package.json index 3fff1777..96df90e0 100644 --- a/libs/angular-webcomponents/package.json +++ b/libs/angular-webcomponents/package.json @@ -1,6 +1,6 @@ { "name": "@onecx/angular-webcomponents", - "version": "5.20.1", + "version": "5.22.2", "license": "Apache-2.0", "peerDependencies": { "@angular/core": "^18.0.5", diff --git a/libs/angular-webcomponents/src/lib/utils/webcomponent-bootstrap.utils.ts b/libs/angular-webcomponents/src/lib/utils/webcomponent-bootstrap.utils.ts index cf7011fe..5095f15c 100644 --- a/libs/angular-webcomponents/src/lib/utils/webcomponent-bootstrap.utils.ts +++ b/libs/angular-webcomponents/src/lib/utils/webcomponent-bootstrap.utils.ts @@ -165,7 +165,9 @@ function connectMicroFrontendRouter(injector: Injector, warn = true): Subscripti function connectRouter(router: Router): Subscription { const initialUrl = `${location.pathname.substring(getLocation().deploymentPath.length)}${location.search}${location.hash}` - router.navigateByUrl(initialUrl) + router.navigateByUrl(initialUrl, { + replaceUrl: true, + }) let lastUrl = initialUrl const observer = new EventsTopic() return observer.pipe(filter((e) => e.type === 'navigated')).subscribe(() => { diff --git a/libs/integration-interface/package.json b/libs/integration-interface/package.json index 05948036..4d72e35f 100644 --- a/libs/integration-interface/package.json +++ b/libs/integration-interface/package.json @@ -1,6 +1,6 @@ { "name": "@onecx/integration-interface", - "version": "5.20.1", + "version": "5.22.2", "license": "Apache-2.0", "peerDependencies": { "tslib": "^2.6.3", diff --git a/libs/keycloak-auth/package.json b/libs/keycloak-auth/package.json index 04c65119..03c108a3 100644 --- a/libs/keycloak-auth/package.json +++ b/libs/keycloak-auth/package.json @@ -1,6 +1,6 @@ { "name": "@onecx/keycloak-auth", - "version": "5.20.1", + "version": "5.22.2", "license": "Apache-2.0", "peerDependencies": { "@angular/common": "^18.0.5", diff --git a/libs/ngrx-accelerator/package.json b/libs/ngrx-accelerator/package.json index ba3edafd..19b4d836 100644 --- a/libs/ngrx-accelerator/package.json +++ b/libs/ngrx-accelerator/package.json @@ -1,6 +1,6 @@ { "name": "@onecx/ngrx-accelerator", - "version": "5.20.1", + "version": "5.22.2", "peerDependencies": { "@angular/core": "^18.0.5", "@angular/router": "^18.0.5", diff --git a/libs/portal-integration-angular/assets/i18n/de.json b/libs/portal-integration-angular/assets/i18n/de.json index 2ccad92d..5d182b8e 100644 --- a/libs/portal-integration-angular/assets/i18n/de.json +++ b/libs/portal-integration-angular/assets/i18n/de.json @@ -115,6 +115,23 @@ "TABLE": "Tabelle" } }, + "OCX_DATA_VIEW_CONTROLS" : { + "NO_GROUP_SELECTED": "Keine Gruppe ausgewählt", + "OPEN_BUTTON_DETAIL": "Dialog zur Auswahl einer benutzerdefinierten Gruppe öffnen", + "DROPDOWN": { + "ARIA_LABEL": "Sortieren nach" + }, + "TOGGLE_BUTTON": { + "ASCENDING_TOOLTIP": "Aufsteigend", + "DESCENDING_TOOLTIP": "Absteigend" + }, + "LAYOUT": { + "LIST": "Liste", + "GRID": "Raster", + "TABLE": "Tabelle" + }, + "DIALOG_TITLE": "Spalten für benutzerdefinierte Gruppe auswählen" + }, "OCX_INTERACTIVE_DATA_VIEW": { "DEFAULT_GROUP": "Standardgruppe", "CUSTOM_GROUP": "Benutzerdefinierte Gruppe", diff --git a/libs/portal-integration-angular/assets/i18n/en.json b/libs/portal-integration-angular/assets/i18n/en.json index fad0c3b0..92c1511e 100644 --- a/libs/portal-integration-angular/assets/i18n/en.json +++ b/libs/portal-integration-angular/assets/i18n/en.json @@ -115,6 +115,23 @@ "TABLE": "Table" } }, + "OCX_DATA_VIEW_CONTROLS" : { + "NO_GROUP_SELECTED": "No group selected", + "OPEN_BUTTON_DETAIL": "Open custom group selection dialog", + "DROPDOWN": { + "ARIA_LABEL": "Sort by" + }, + "TOGGLE_BUTTON": { + "ASCENDING_TOOLTIP": "Ascending", + "DESCENDING_TOOLTIP": "Descending" + }, + "LAYOUT": { + "LIST": "List", + "GRID": "Grid", + "TABLE": "Table" + }, + "DIALOG_TITLE": "Custom group column selection" + }, "OCX_INTERACTIVE_DATA_VIEW": { "DEFAULT_GROUP": "Default group", "CUSTOM_GROUP": "Custom group", diff --git a/libs/portal-integration-angular/package.json b/libs/portal-integration-angular/package.json index 249aeb9c..dbf1489a 100644 --- a/libs/portal-integration-angular/package.json +++ b/libs/portal-integration-angular/package.json @@ -1,6 +1,6 @@ { "name": "@onecx/portal-integration-angular", - "version": "5.20.1", + "version": "5.22.2", "license": "Apache-2.0", "peerDependencies": { "@angular/common": "^18.0.5", diff --git a/libs/portal-integration-angular/src/lib/core/components/button-dialog/button-dialog.component.html b/libs/portal-integration-angular/src/lib/core/components/button-dialog/button-dialog.component.html index d4c2a8ef..ecab425b 100644 --- a/libs/portal-integration-angular/src/lib/core/components/button-dialog/button-dialog.component.html +++ b/libs/portal-integration-angular/src/lib/core/components/button-dialog/button-dialog.component.html @@ -3,9 +3,7 @@ -
+
diff --git a/libs/portal-integration-angular/src/lib/core/components/data-view-controls/data-view-controls.component.html b/libs/portal-integration-angular/src/lib/core/components/data-view-controls/data-view-controls.component.html index f3685348..c07cb5ec 100644 --- a/libs/portal-integration-angular/src/lib/core/components/data-view-controls/data-view-controls.component.html +++ b/libs/portal-integration-angular/src/lib/core/components/data-view-controls/data-view-controls.component.html @@ -20,7 +20,7 @@ *ngIf="columnTemplates.length > 0 && toggleColumnActive" (templateChanged)="handleTemplateChange($event)" (templateReset)="handleTemplateReset()" - [placeholder]="translations?.templatePickerDropdownPlaceholder || dropdownPlaceholderText || ('OCX_INTERACTIVE_DATA_VIEW.NO_GROUP_SELECTED' | translate)" + [placeholder]="translations?.templatePickerDropdownPlaceholder || dropdownPlaceholderText || ('OCX_DATA_VIEW_CONTROLS.NO_GROUP_SELECTED' | translate)" >
@@ -73,7 +73,7 @@ styleClass="data-view-control-border min-w-min w-7rem" [options]="sortingOptions" (onChange)="selectSorting($event)" - [ariaLabel]="('OCX_LIST_GRID_SORT.DROPDOWN.ARIA_LABEL' | translate)" + [ariaLabel]="('OCX_DATA_VIEW_CONTROLS.DROPDOWN.ARIA_LABEL' | translate)" >
diff --git a/libs/portal-integration-angular/src/lib/core/components/data-view-controls/data-view-controls.component.ts b/libs/portal-integration-angular/src/lib/core/components/data-view-controls/data-view-controls.component.ts index c30c749e..b639e23f 100644 --- a/libs/portal-integration-angular/src/lib/core/components/data-view-controls/data-view-controls.component.ts +++ b/libs/portal-integration-angular/src/lib/core/components/data-view-controls/data-view-controls.component.ts @@ -30,22 +30,22 @@ const ALL_VIEW_MODES: ViewMode[] = [ id: 'ocx-data-layout-selection-list', icon: PrimeIcons.LIST, mode: 'list', - tooltipKey: 'OCX_DATA_LAYOUT_SELECTION.LAYOUT.LIST', - labelKey: 'OCX_DATA_LAYOUT_SELECTION.LAYOUT.LIST', + tooltipKey: 'OCX_DATA_VIEW_CONTROLS.LAYOUT.LIST', + labelKey: 'OCX_DATA_VIEW_CONTROLS.LAYOUT.LIST', }, { id: 'ocx-data-layout-selection-grid', icon: PrimeIcons.TH_LARGE, mode: 'grid', - tooltipKey: 'OCX_DATA_LAYOUT_SELECTION.LAYOUT.GRID', - labelKey: 'OCX_DATA_LAYOUT_SELECTION.LAYOUT.GRID', + tooltipKey: 'OCX_DATA_VIEW_CONTROLS.LAYOUT.GRID', + labelKey: 'OCX_DATA_VIEW_CONTROLS.LAYOUT.GRID', }, { id: 'ocx-data-layout-selection-table', icon: PrimeIcons.TABLE, mode: 'table', - tooltipKey: 'OCX_DATA_LAYOUT_SELECTION.LAYOUT.TABLE', - labelKey: 'OCX_DATA_LAYOUT_SELECTION.LAYOUT.TABLE', + tooltipKey: 'OCX_DATA_VIEW_CONTROLS.LAYOUT.TABLE', + labelKey: 'OCX_DATA_VIEW_CONTROLS.LAYOUT.TABLE', }, ] @@ -216,7 +216,7 @@ export class DataViewControlsComponent implements OnInit, OnChanges { }, header: this.translations?.columnDialogHeaderText || - this.translate.instant('OCX_CUSTOM_GROUP_COLUMN_SELECTOR.DIALOG_TITLE'), + this.translate.instant('OCX_DATA_VIEW_CONTROLS.DIALOG_TITLE'), width: '70%', contentStyle: { 'max-height': '500px', overflow: 'auto', padding: 0 }, }) diff --git a/libs/portal-layout-styles/package.json b/libs/portal-layout-styles/package.json index 6cdcbc9a..5682da8d 100644 --- a/libs/portal-layout-styles/package.json +++ b/libs/portal-layout-styles/package.json @@ -1,6 +1,6 @@ { "name": "@onecx/portal-layout-styles", - "version": "5.20.1", + "version": "5.22.2", "license": "Apache-2.0", "peerDependencies": { "tslib": "^2.6.3" diff --git a/libs/portal-layout-styles/src/styles/primeng/sass/theme/designer/components/overlay/_dialog.scss b/libs/portal-layout-styles/src/styles/primeng/sass/theme/designer/components/overlay/_dialog.scss index 29ccec44..c27ef581 100644 --- a/libs/portal-layout-styles/src/styles/primeng/sass/theme/designer/components/overlay/_dialog.scss +++ b/libs/portal-layout-styles/src/styles/primeng/sass/theme/designer/components/overlay/_dialog.scss @@ -63,7 +63,7 @@ } } -@media (max-width: $mobileBreakpoint) { +@media (max-width: $smallScreenBreakpoint) { .p-dialog.p-dialog { transition: none; transform: none; diff --git a/libs/portal-layout-styles/src/styles/primeng/sass/variables/layout/_layout_common.scss b/libs/portal-layout-styles/src/styles/primeng/sass/variables/layout/_layout_common.scss index 814dce71..5305c161 100644 --- a/libs/portal-layout-styles/src/styles/primeng/sass/variables/layout/_layout_common.scss +++ b/libs/portal-layout-styles/src/styles/primeng/sass/variables/layout/_layout_common.scss @@ -7,3 +7,4 @@ $animationTimingFunction: cubic-bezier(0.05, 0.74, 0.2, 0.99) !default; $letterSpacing: normal !default; $transitionDuration: 0.2s !default; $mobileBreakpoint: 991px !default; +$smallScreenBreakpoint: 576px !default; diff --git a/libs/portal-layout-styles/src/styles/shell/_variables.scss b/libs/portal-layout-styles/src/styles/shell/_variables.scss index 5ddcf0c1..4c3f8ad7 100644 --- a/libs/portal-layout-styles/src/styles/shell/_variables.scss +++ b/libs/portal-layout-styles/src/styles/shell/_variables.scss @@ -34,6 +34,7 @@ $submenuShadow: 0 2px 4px -1px rgba(0, 0, 0, 0.2), 0 4px 5px 0 rgba(0, 0, 0, 0.1 $animationTimingFunction: cubic-bezier(0.05, 0.74, 0.2, 0.99) !default; // $transitionDuration: 0.2s !default; $mobileBreakpoint: 991px !default; +$smallScreenBreakpoint: 576px !default; // Menu Light // $menuBgColor: #fdfeff; diff --git a/libs/portal-layout-styles/src/styles/shell/menu/_menu_theme.scss b/libs/portal-layout-styles/src/styles/shell/menu/_menu_theme.scss index 29bad27f..78a6c732 100644 --- a/libs/portal-layout-styles/src/styles/shell/menu/_menu_theme.scss +++ b/libs/portal-layout-styles/src/styles/shell/menu/_menu_theme.scss @@ -56,7 +56,7 @@ } .layout-inline-menu { - border-color: var(--inline-menu-border-color); + border-color: var(--menu-inline-border-color); a { color: var(--menu-item-text-color); diff --git a/libs/portal-layout-styles/src/styles/shell/shell.scss b/libs/portal-layout-styles/src/styles/shell/shell.scss index 2134cdef..21d53e03 100644 --- a/libs/portal-layout-styles/src/styles/shell/shell.scss +++ b/libs/portal-layout-styles/src/styles/shell/shell.scss @@ -45,6 +45,7 @@ --menu-active-item-text-color: var(--menu-item-text-color); --menu-active-item-bg-color: var(--menu-item-hover-bg-color); --inline-menu-border-color: var(--divider-color); + --menu-inline-border-color: var(--divider-color); --mobile-break-point: #{$mobileBreakpoint}; --submenu-shadow: #{$submenuShadow}; --menu-shadow: #{$menuShadow}; diff --git a/libs/shell-core/package.json b/libs/shell-core/package.json index 7af60e79..d09bb600 100644 --- a/libs/shell-core/package.json +++ b/libs/shell-core/package.json @@ -1,6 +1,6 @@ { "name": "@onecx/shell-core", - "version": "5.20.1", + "version": "5.22.2", "license": "Apache-2.0", "peerDependencies": { "rxjs": "^7.8.1", diff --git a/package.json b/package.json index 022785ee..7b94a4ab 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@onecx/onecx-portal-ui-libs", - "version": "5.20.1", + "version": "5.22.2", "license": "Apache-2.0", "scripts": { "sass": "npx sass libs/portal-integration-angular/assets/styles.scss libs/portal-integration-angular/assets/output.css",