Skip to content

Commit

Permalink
Merge branch 'main' into feat/ngrx-local-sync-key-nesting
Browse files Browse the repository at this point in the history
  • Loading branch information
bastianjakobi authored Oct 9, 2024
2 parents 65c6b1b + 3993c50 commit 9a7beb0
Show file tree
Hide file tree
Showing 17 changed files with 45 additions and 31 deletions.
12 changes: 12 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,15 @@
## [5.16.1](https://github.com/onecx/onecx-portal-ui-libs/compare/v5.16.0...v5.16.1) (2024-10-08)

### Bug Fixes

* angular-remote-component referenced in package of angular-accelerator ([#529](https://github.com/onecx/onecx-portal-ui-libs/issues/529)) ([02eb3a4](https://github.com/onecx/onecx-portal-ui-libs/commit/02eb3a41c45cf937f2a706bd52c15603ff720189))

## [5.16.0](https://github.com/onecx/onecx-portal-ui-libs/compare/v5.15.0...v5.16.0) (2024-10-07)

### Features

* search config slot in search header and column group slot in interactive-data-view ([#369](https://github.com/onecx/onecx-portal-ui-libs/issues/369)) ([bbf7073](https://github.com/onecx/onecx-portal-ui-libs/commit/bbf7073e87496d1efb8faeafa846294c1e559ea2))

## [5.15.0](https://github.com/onecx/onecx-portal-ui-libs/compare/v5.14.0...v5.15.0) (2024-10-04)

### Features
Expand Down
2 changes: 1 addition & 1 deletion libs/accelerator/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@onecx/accelerator",
"version": "5.15.0",
"version": "5.16.1",
"license": "Apache-2.0",
"peerDependencies": {
"tslib": "^2.6.3",
Expand Down
3 changes: 2 additions & 1 deletion libs/angular-accelerator/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@onecx/angular-accelerator",
"version": "5.15.0",
"version": "5.16.1",
"license": "Apache-2.0",
"peerDependencies": {
"@angular/common": "^18.0.5",
Expand All @@ -13,6 +13,7 @@
"@ngneat/until-destroy": "^10.0.0",
"@onecx/integration-interface": "^5",
"@onecx/angular-integration-interface": "^5",
"@onecx/angular-remote-components": "^5",
"chart.js": "^4.4.3",
"d3-scale-chromatic": "^3.1.0",
"rxjs": "~7.8.1",
Expand Down
2 changes: 1 addition & 1 deletion libs/angular-auth/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@onecx/angular-auth",
"version": "5.15.0",
"version": "5.16.1",
"license": "Apache-2.0",
"peerDependencies": {
"@angular-architects/module-federation": "^18.0.4",
Expand Down
2 changes: 1 addition & 1 deletion libs/angular-integration-interface/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@onecx/angular-integration-interface",
"version": "5.15.0",
"version": "5.16.1",
"license": "Apache-2.0",
"peerDependencies": {
"@angular/core": "^18.0.5",
Expand Down
2 changes: 1 addition & 1 deletion libs/angular-remote-components/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@onecx/angular-remote-components",
"version": "5.15.0",
"version": "5.16.1",
"license": "Apache-2.0",
"peerDependencies": {
"@angular/common": "^18.0.5",
Expand Down
2 changes: 1 addition & 1 deletion libs/angular-testing/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@onecx/angular-testing",
"version": "5.15.0",
"version": "5.16.1",
"license": "Apache-2.0",
"peerDependencies": {
"@angular/cdk": "^18.0.5",
Expand Down
2 changes: 1 addition & 1 deletion libs/angular-webcomponents/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@onecx/angular-webcomponents",
"version": "5.15.0",
"version": "5.16.1",
"license": "Apache-2.0",
"peerDependencies": {
"@angular/core": "^18.0.5",
Expand Down
2 changes: 1 addition & 1 deletion libs/integration-interface/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@onecx/integration-interface",
"version": "5.15.0",
"version": "5.16.1",
"license": "Apache-2.0",
"peerDependencies": {
"tslib": "^2.6.3",
Expand Down
2 changes: 1 addition & 1 deletion libs/keycloak-auth/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@onecx/keycloak-auth",
"version": "5.15.0",
"version": "5.16.1",
"license": "Apache-2.0",
"peerDependencies": {
"@angular/common": "^18.0.5",
Expand Down
2 changes: 1 addition & 1 deletion libs/ngrx-accelerator/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@onecx/ngrx-accelerator",
"version": "5.15.0",
"version": "5.16.1",
"peerDependencies": {
"@angular/core": "^18.0.5",
"@angular/router": "^18.0.5",
Expand Down
2 changes: 1 addition & 1 deletion libs/portal-integration-angular/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@onecx/portal-integration-angular",
"version": "5.15.0",
"version": "5.16.1",
"license": "Apache-2.0",
"peerDependencies": {
"@angular/common": "^18.0.5",
Expand Down
2 changes: 1 addition & 1 deletion libs/portal-layout-styles/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@onecx/portal-layout-styles",
"version": "5.15.0",
"version": "5.16.1",
"license": "Apache-2.0",
"peerDependencies": {
"tslib": "^2.6.3"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -680,8 +680,8 @@ $menuitemHoverBg: rgba(0, 0, 0, 0.04);
$menuitemTextActiveColor: $textColor;
$menuitemIconActiveColor: $textSecondaryColor;
$menuitemActiveBg: rgba(0, 0, 0, 0.04);
$menuitemActiveFocusBg: rgba(0, 0, 0, 0.02);
$menuitemFocusBg: rgba(0, 0, 0, 0.02);
$menuitemActiveFocusBg: rgba(0, 0, 0, 0.04);
$menuitemFocusBg: rgba(0, 0, 0, 0.04);
$menuitemSubmenuIconFontSize: 0.875rem;
$submenuHeaderMargin: 0;
$submenuHeaderPadding: 1rem;
Expand Down
31 changes: 16 additions & 15 deletions libs/portal-layout-styles/src/styles/shell/shell.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,21 @@

:root {
// Top Bar Variables
--topbar-bg-color: rgb(18 171 219);
--topbar-bg-color: #0D3650;
--topbar-text-color: #ffffff;
--topbar-left-bg-color: #ececec;
--topbar-left-bg-color: #0D3650;
--topbar-item-text-color: #ffffff;
--topbar-item-text-hover-bg-color: #ffffff;
--topbar-item-text-hover-bg-color: #262626;
--topbar-menu-button-bg-color: rgb(255 0 68);
--menu-button-text-color: #ffffff;
--logo-color: #ffffff

// Body Variables
--page-padding: 1rem;
--page-padding-lg: calc(var(--page-padding) * 2);
--body-bg-color: #f7f7f7;
--text-color: rgb(0 0 0 / 87%);
--text-secondary-color: #616161;
--text-secondary-color: #262626;
--font-size: 14px;
--font-family: Ubuntu, Helvetica Neue Light, Helvetica Neue, Helvetica, Arial, Lucida Grande, sans-serif;
// --border-width: #{$border-width};
Expand All @@ -25,22 +26,22 @@

// Contents Variables
--content-bg-color: #ffffff;
--content-alt-bg-color: #eceff1;
--content-alt-bg-color: #ffffff;
--overlay-content-bg-color: #ffffff;
// --hover-bg-color: #{$hoverBgColor};
// --solid-surface-text-color: #{$solidSurfaceTextColor};
--divider-color: #ff00ff;
--hover-bg-color: #ad1457;
--solid-surface-text-color: #ffffff;
--divider-color: #e4e4e4;

// Animation Variables
--animation-duration: 0.2s;
--animation-timing: #{$animationTimingFunction};

// Menu Style Variables
--menu-text-color: #00ff00;
--menu-bg-color: #ff00ff;
--menu-item-text-color: var(--text-color, #000000);
--menu-item-hover-bg-color: rgb(0 0 0 / 4%);
--menu-active-item-bg-color: var(--menu-item-hover-bg-color);
--menu-text-color: #274B5F;
--menu-bg-color: #fdfeff;
--menu-item-text-color: #515c66;
--menu-item-hover-bg-color: #e4e4e4;
--menu-active-item-bg-color: rgba(0, 0, 0, 0.04);
--menu-active-item-text-color: var(--menu-item-text-color);
--inline-menu-border-color: var(--divider-color);
--mobile-break-point: #{$mobileBreakpoint};
Expand All @@ -57,8 +58,8 @@
--h6-font-size: #{$h6FontSize};

// General Colors Variables
--primary-color: rgb(18, 171, 219);
--secondary-color: #ee4400;
--primary-color: #274B5F;
--secondary-color: #1C4257;
}

@import '_mixins'; // The variables were checked
Expand Down
2 changes: 1 addition & 1 deletion libs/shell-core/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@onecx/shell-core",
"version": "5.15.0",
"version": "5.16.1",
"license": "Apache-2.0",
"peerDependencies": {
"rxjs": "^7.8.1",
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@onecx/onecx-portal-ui-libs",
"version": "5.15.0",
"version": "5.16.1",
"license": "Apache-2.0",
"scripts": {
"sass": "npx sass libs/portal-integration-angular/assets/styles.scss libs/portal-integration-angular/assets/output.css",
Expand Down

0 comments on commit 9a7beb0

Please sign in to comment.