build(dependencies): update bootstrap to 4.0.0-alpha.6

This commit is contained in:
hryb 2017-04-10 15:48:15 +03:00 committed by Lex Zhukov
parent 2d6e848df3
commit ef2ca9c09c
25 changed files with 227 additions and 172 deletions

View file

@ -21,8 +21,12 @@ export class BaCheckbox implements ControlValueAccessor {
state.valueAccessor = this;
}
public onChange(value: any): void {}
public onTouch(value: any): void {}
public onChange(value: any): void {
}
public onTouch(value: any): void {
}
public writeValue(state: any): void {
this.state = state;
}
@ -31,7 +35,10 @@ export class BaCheckbox implements ControlValueAccessor {
this.onChange = function(state: boolean) {
this.writeValue(state);
this.model.viewToModelUpdate(state);
}
};
}
public registerOnTouched(fn: any): void {
this.onTouch = fn;
}
public registerOnTouched(fn: any): void { this.onTouch = fn; }
}

View file

@ -4,6 +4,7 @@ import {ControlValueAccessor, NgModel} from '@angular/forms';
@Component({
selector: 'ba-multi-checkbox[ngModel]',
templateUrl: './baMultiCheckbox.html',
styleUrls: ['./baMultiCheckbox.scss'],
providers: [NgModel]
})
export class BaMultiCheckbox implements ControlValueAccessor {
@ -20,7 +21,6 @@ export class BaMultiCheckbox implements ControlValueAccessor {
public getProp(item: any, propName: string): string {
const prop = this.propertiesMapping[propName];
if (!prop) {
return item[propName];
} else if (typeof prop === 'function') {
@ -38,7 +38,7 @@ export class BaMultiCheckbox implements ControlValueAccessor {
this.onChange = function(state: boolean) {
this.writeValue(state);
this.model.viewToModelUpdate(state);
}
};
}
public registerOnTouched(fn: any): void { this.onTouch = fn; }
}

View file

@ -1,4 +1,4 @@
<div class="{{baMultiCheckboxClass}}">
<div class="{{baMultiCheckboxClass}} container-content">
<ba-checkbox *ngFor="let item of state"
[(ngModel)]="item[propertiesMapping.model]"
[baCheckboxClass]="getProp(item, 'baCheckboxClass')"

View file

@ -0,0 +1,10 @@
@import '../../sass/conf/conf';
.container-content {
width: 100%;
display: flex;
ba-checkbox {
width: 100%;
}
}

View file

@ -5,6 +5,7 @@ $hover: 24;
}
.btn {
cursor: pointer;
border-radius: 5px;
transition: all 0.1s ease;
padding: 0.344rem 1rem;

View file

@ -314,6 +314,10 @@ label.custom-input-danger {
.input-demo {
line-height: 25px;
ba-multi-checkbox {
width: 100%;
}
}
@mixin validationState($color, $focusColor) {
@ -400,6 +404,10 @@ label.custom-input-danger {
vertical-align: sub;
}
.raiting-box {
display: flex;
}
.help-block.error-block {
display: none;
.has-error &.basic-block {

View file

@ -0,0 +1,19 @@
.modal-header {
border: none;
padding: 10px 15px 0 15px;
}
.modal-footer {
border: none;
}
button.close {
padding-bottom: 2px;
color: #000;
text-shadow: 0 1px 0 #fff;
opacity: .2;
&:hover {
opacity: .5;
}
}

View file

@ -340,3 +340,12 @@ th {
.table-responsive {
margin-top: 10px;
}
.ng2-smart-pagination {
display: flex !important;
}
.ng2-smart-pagination-nav {
margin-top: 16px;
}

View file

@ -432,52 +432,53 @@ a.learn-more {
@media screen and (min-width: 1620px) {
.col-xlg-1 {
width: 8.33333333%;
max-width: 8.33333333%;
flex: 0 0 8.33333333%;
}
.col-xlg-2 {
width: 16.66666667%;
max-width: 16.66666667%;
flex: 0 0 16.66666667%;
}
.col-xlg-3 {
width: 25%;
max-width: 25%;
flex: 0 0 25%;
}
.col-xlg-4 {
width: 33.33333333%;
max-width: 33.33333333%;
flex: 0 0 33.33333333%;
}
.col-xlg-5 {
width: 41.66666667%;
max-width: 41.66666667%;
flex: 0 0 41.66666667%;
}
.col-xlg-6 {
width: 50%;
max-width: 50%;
flex: 0 0 50%;
}
.col-xlg-7 {
width: 58.33333333%;
max-width: 58.33333333%;
flex: 0 0 58.33333333%;
}
.col-xlg-8 {
width: 66.66666667%;
max-width: 66.66666667%;
flex: 0 0 66.66666667%;
}
.col-xlg-9 {
width: 75%;
max-width: 75%;
flex: 0 0 75%;
}
.col-xlg-10 {
width: 83.33333333%;
max-width: 83.33333333%;
flex: 0 0 83.33333333%;
}
.col-xlg-11 {
width: 91.66666667%;
max-width: 91.66666667%;
flex: 0 0 91.66666667%;
}
.col-xlg-12 {
width: 100%;
max-width: 100%;
flex: 0 0 100%;
}
}

View file

@ -9,3 +9,4 @@
@import "sass/table";
@import "sass/form";
@import "sass/treeView";
@import "sass/modal";