diff options
Diffstat (limited to 'catalog-ui/src/app/ng2/shared')
4 files changed, 23 insertions, 20 deletions
diff --git a/catalog-ui/src/app/ng2/shared/checkbox/checkbox.component.html b/catalog-ui/src/app/ng2/shared/checkbox/checkbox.component.html index efe830d6e0..872bf90329 100644 --- a/catalog-ui/src/app/ng2/shared/checkbox/checkbox.component.html +++ b/catalog-ui/src/app/ng2/shared/checkbox/checkbox.component.html @@ -1,5 +1,5 @@ <div class="checkbox-container {{checkboxStyle}}"> - <div class="checkbox-animation" [@checkEffect]="checked"></div> + <div class="checkbox-animation"></div><!--[@checkEffect]="checked"--> <label class="checkbox-label" > <input type="checkbox" class="checkbox-hidden" [ngModel]="checked" (ngModelChange)="toggleState($event)" [disabled]="disabled" /> <div class="checkbox-icon"></div> diff --git a/catalog-ui/src/app/ng2/shared/checkbox/checkbox.component.less b/catalog-ui/src/app/ng2/shared/checkbox/checkbox.component.less index 7ed8a22194..3a28c5fb42 100644 --- a/catalog-ui/src/app/ng2/shared/checkbox/checkbox.component.less +++ b/catalog-ui/src/app/ng2/shared/checkbox/checkbox.component.less @@ -1,4 +1,6 @@ @import '../../../../assets/styles/tlv-sprite'; +@import '../../../../assets/styles/sprite'; + .checkbox-container { display:inline-block; @@ -12,7 +14,7 @@ } .checkbox-label { - font-weight: normal; + font-weight: inherit; font-size: inherit; } @@ -37,7 +39,8 @@ height:0; display:none; &:checked ~ .checkbox-icon::before{ - background-position: -10px -120px; + .sprite-new; + .filled-checkbox-icon } &[disabled] ~ .checkbox-icon::before { /* TODO: add disabled styles here */ @@ -52,7 +55,7 @@ background-color: #009fdb; position: absolute; left: 2px; - top: 5px; + top: 4px; width:10px; height:10px; border-radius: 50%; diff --git a/catalog-ui/src/app/ng2/shared/checkbox/checkbox.component.ts b/catalog-ui/src/app/ng2/shared/checkbox/checkbox.component.ts index 5a9954c336..c1bb28b6ff 100644 --- a/catalog-ui/src/app/ng2/shared/checkbox/checkbox.component.ts +++ b/catalog-ui/src/app/ng2/shared/checkbox/checkbox.component.ts @@ -1,19 +1,19 @@ import { Component, Input, Output, EventEmitter, ViewEncapsulation } from '@angular/core'; -import { trigger, state, style, transition, animate, keyframes } from '@angular/core'; +//import { trigger, state, style, transition, animate, keyframes } from '@angular/core'; @Component({ selector: 'checkbox', templateUrl: './checkbox.component.html', styleUrls: ['./checkbox.component.less'], - encapsulation: ViewEncapsulation.None, - animations: [ - trigger('checkEffect', [ - state('true', style({ position: 'absolute', left: '2px', top: '5px', width: '10px', height: '10px', display: 'none', opacity: '.5' })), - state('false', style({ left: '-18px', top: '-15px', height: '50px', width: '50px', opacity: '0' })), - transition('1 => 0', animate('150ms ease-out')), - transition('0 => 1', animate('150ms ease-in')) - ]) - ] + encapsulation: ViewEncapsulation.None + // animations: [ + // trigger('checkEffect', [ + // state('true', style({ position: 'absolute', left: '2px', top: '5px', width: '10px', height: '10px', display: 'none', opacity: '.5' })), + // state('false', style({ left: '-18px', top: '-15px', height: '50px', width: '50px', opacity: '0' })), + // transition('1 => 0', animate('150ms ease-out')), + // transition('0 => 1', animate('150ms ease-in')) + // ]) + // ] }) export class CheckboxComponent { diff --git a/catalog-ui/src/app/ng2/shared/tabs/tabs.component.less b/catalog-ui/src/app/ng2/shared/tabs/tabs.component.less index fa05249ea4..6f9e57aaf2 100644 --- a/catalog-ui/src/app/ng2/shared/tabs/tabs.component.less +++ b/catalog-ui/src/app/ng2/shared/tabs/tabs.component.less @@ -1,5 +1,9 @@ @import '../../../../assets/styles/variables'; +tab { + height: 100%; +} + .tabs { display:flex; flex: 0 0 auto; @@ -14,8 +18,8 @@ .tab-content-container { flex: 1; - height: 100%; width:100%; + overflow-y:hidden; } .tab-content { @@ -33,12 +37,8 @@ position:relative; &:first-child { - border-top-left-radius: 8px; border-left:solid 1px #d2d2d2; } - &:last-child { - border-top-right-radius: 8px; - } &.active { background-color:#009fdb; @@ -77,7 +77,7 @@ &.active { color: @main_color_a; &:after { - transform: scaleX(1); + transform: scaleX(1.2); } } } |