Skip to content
This repository has been archived by the owner on Aug 25, 2020. It is now read-only.

Commit

Permalink
Merge pull request #3 from ngx-kit/dev-7.1.0
Browse files Browse the repository at this point in the history
Release 7.1.0
  • Loading branch information
navix authored Dec 11, 2018
2 parents 8cd803e + 2c74291 commit 7ecfba3
Show file tree
Hide file tree
Showing 8 changed files with 19 additions and 13 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@
</div>
<div *ngIf="!service.multiple && !service.input"
class="model">
<span class="value">
{{ service.inputView?.view }}
</span>
<span class="value">
{{ service.inputViews[0]?.view }}
</span>
</div>
<ng-container *ngIf="multiple">
<span *ngFor="let item of service.inputView" class="item">
<span *ngFor="let item of service.inputViews" class="item">
{{ item.view }}
<kit-icon (mousedown)="removeItem($event, item.model)"
[xml]="icons.cross"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
<div class="title"
[class.-active]="activeState"
[class.-collapsible]="collapsible"
(click)="toggle()">
<span class="wrapper"><ng-content></ng-content></span>
<button class="arrow">
<button *ngIf="collapsible"
class="arrow">
<kit-icon *ngIf="activeState" name="sula-arrow-up"></kit-icon>
<kit-icon *ngIf="!activeState" name="sula-arrow-down"></kit-icon>
</button>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
flex-direction: row;
font-weight: 600;
padding: calc(var(--grid) * 2);

.wrapper {
flex-grow: 1;
}
Expand All @@ -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;
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ export class UiVerticalMenuGroupComponent implements OnInit, OnChanges, OnDestro

@Input() activeRoute: any[] | string;

@Input() collapsible = true;

@ContentChildren(RouterLinkActive) routerLinks: QueryList<RouterLinkActive>;

activeState = false;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
display: block;
padding: calc(var(--grid) * 2);
text-decoration: none;

&.-active {
background: var(--primaryColor);
border-radius: var(--borderRadius);
Expand All @@ -27,5 +26,4 @@
font-weight: 400;
margin: calc(var(--grid) / 2) 0;
padding: var(--grid) calc(var(--grid) * 2);

}
1 change: 1 addition & 0 deletions projects/ui/src/public_api.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down

0 comments on commit 7ecfba3

Please sign in to comment.