diff --git a/package.json b/package.json index 39dee94..4e3a41c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@ngx-kit/sula", - "version": "7.0.0", + "version": "7.1.0", "scripts": { "clean": "rimraf ./dist && rimraf ./tmp", "ui-docs:serve": "ng run ui-docs:serve", diff --git a/projects/ui/src/lib/ui-dropdown/ui-dropdown-item/ui-dropdown-item.component.scss b/projects/ui/src/lib/ui-dropdown/ui-dropdown-item/ui-dropdown-item.component.scss index 3aa7501..4665174 100644 --- a/projects/ui/src/lib/ui-dropdown/ui-dropdown-item/ui-dropdown-item.component.scss +++ b/projects/ui/src/lib/ui-dropdown/ui-dropdown-item/ui-dropdown-item.component.scss @@ -5,6 +5,7 @@ color: var(--mainTextColor); cursor: pointer; display: block; + font-size: 1em; margin: 0; padding: var(--grid) calc(var(--grid) * 1.5); outline: none; diff --git a/projects/ui/src/lib/ui-ext-select/ui-ext-select/ui-ext-select.component.html b/projects/ui/src/lib/ui-ext-select/ui-ext-select/ui-ext-select.component.html index efb6bc9..a8bed7c 100644 --- a/projects/ui/src/lib/ui-ext-select/ui-ext-select/ui-ext-select.component.html +++ b/projects/ui/src/lib/ui-ext-select/ui-ext-select/ui-ext-select.component.html @@ -15,12 +15,12 @@
- - {{ service.inputView?.view }} - + + {{ service.inputViews[0]?.view }} +
- + {{ item.view }} - diff --git a/projects/ui/src/lib/ui-vertical-menu/ui-vertical-menu-group/ui-vertical-menu-group.component.scss b/projects/ui/src/lib/ui-vertical-menu/ui-vertical-menu-group/ui-vertical-menu-group.component.scss index cbf8ded..b2352b9 100644 --- a/projects/ui/src/lib/ui-vertical-menu/ui-vertical-menu-group/ui-vertical-menu-group.component.scss +++ b/projects/ui/src/lib/ui-vertical-menu/ui-vertical-menu-group/ui-vertical-menu-group.component.scss @@ -9,7 +9,6 @@ flex-direction: row; font-weight: 600; padding: calc(var(--grid) * 2); - .wrapper { flex-grow: 1; } @@ -20,9 +19,12 @@ cursor: pointer; outline: none; } - &:hover { - background: var(--toTextColor1); - border-radius: var(--borderRadius); - transition: all var(--transitionSlow) linear; + &.-collapsible { + cursor: default; + &:hover { + background: var(--toTextColor1); + border-radius: var(--borderRadius); + transition: all var(--transitionSlow) linear; + } } } diff --git a/projects/ui/src/lib/ui-vertical-menu/ui-vertical-menu-group/ui-vertical-menu-group.component.ts b/projects/ui/src/lib/ui-vertical-menu/ui-vertical-menu-group/ui-vertical-menu-group.component.ts index 4daad73..ab09255 100644 --- a/projects/ui/src/lib/ui-vertical-menu/ui-vertical-menu-group/ui-vertical-menu-group.component.ts +++ b/projects/ui/src/lib/ui-vertical-menu/ui-vertical-menu-group/ui-vertical-menu-group.component.ts @@ -30,6 +30,8 @@ export class UiVerticalMenuGroupComponent implements OnInit, OnChanges, OnDestro @Input() activeRoute: any[] | string; + @Input() collapsible = true; + @ContentChildren(RouterLinkActive) routerLinks: QueryList; activeState = false; diff --git a/projects/ui/src/lib/ui-vertical-menu/ui-vertical-menu-item/ui-vertical-menu-item.component.scss b/projects/ui/src/lib/ui-vertical-menu/ui-vertical-menu-item/ui-vertical-menu-item.component.scss index 2ad3817..25cd8d9 100644 --- a/projects/ui/src/lib/ui-vertical-menu/ui-vertical-menu-item/ui-vertical-menu-item.component.scss +++ b/projects/ui/src/lib/ui-vertical-menu/ui-vertical-menu-item/ui-vertical-menu-item.component.scss @@ -5,7 +5,6 @@ display: block; padding: calc(var(--grid) * 2); text-decoration: none; - &.-active { background: var(--primaryColor); border-radius: var(--borderRadius); @@ -27,5 +26,4 @@ font-weight: 400; margin: calc(var(--grid) / 2) 0; padding: var(--grid) calc(var(--grid) * 2); - } diff --git a/projects/ui/src/public_api.ts b/projects/ui/src/public_api.ts index 11f7f2d..4c85a6f 100644 --- a/projects/ui/src/public_api.ts +++ b/projects/ui/src/public_api.ts @@ -8,6 +8,7 @@ export * from './lib/ui-date-picker/ui-date-picker'; export * from './lib/ui-dialog/ui-dialog'; export * from './lib/ui-drawer/ui-drawer'; export * from './lib/ui-dropdown/ui-dropdown'; +export * from './lib/ui-ext-select/ui-ext-select'; export * from './lib/ui-file/ui-file'; export * from './lib/ui-form/ui-form'; export * from './lib/ui-loading-bar/ui-loading-bar';