Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: proper ant design theme #1145

Merged
merged 1 commit into from
Apr 20, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion demo/app/examples/reactive-forms.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import { delay } from 'rxjs/operators';
</div>
<div class="form-group col-md-6">
<label for="heroId">Basic select</label>
<ng-select [searchable]="false" labelForId="heroId" formControlName="heroId">
<ng-select [searchable]="false" [clearable]="false" labelForId="heroId" formControlName="heroId">
<ng-template ng-label-tmp let-item="item" let-label="label">
<img src="{{basePath}}/assets/{{item}}.png" width="20px" height="20px" /> {{label}}
</ng-template>
Expand Down
2 changes: 1 addition & 1 deletion demo/app/layout/header.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ type langDir = 'ltr' | 'rtl';

<div class="collapse navbar-collapse">
<div ngbDropdown class="d-inline-block">
<button class="btn btn-outline-light btn-sm" style="width: 130px;" ngbDropdownToggle>{{theme}}</button>
<button class="btn btn-outline-light btn-sm" style="width: 150px;" ngbDropdownToggle>{{theme}}</button>
<div ngbDropdownMenu>
<button (click)="setTheme('Default theme')" class="dropdown-item btn-sm">Default theme</button>
<button (click)="setTheme('Material theme')" class="dropdown-item btn-sm">Material theme</button>
Expand Down
2 changes: 1 addition & 1 deletion src/ng-select/ng-select.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,6 @@ export class NgSelectComponent implements OnDestroy, OnChanges, AfterViewInit, C

@Input() bindLabel: string;
@Input() bindValue: string;
@Input() clearable = true;
@Input() markFirst = true;
@Input() placeholder: string;
@Input() notFoundText: string;
Expand Down Expand Up @@ -113,6 +112,7 @@ export class NgSelectComponent implements OnDestroy, OnChanges, AfterViewInit, C
@Input() @HostBinding('class.ng-select-multiple') multiple = false;
@Input() @HostBinding('class.ng-select-taggable') addTag: boolean | AddTagFn = false;
@Input() @HostBinding('class.ng-select-searchable') searchable = true;
@Input() @HostBinding('class.ng-select-clearable') clearable = true;
@Input() @HostBinding('class.ng-select-opened') isOpen = false;

@Input()
Expand Down