summaryrefslogtreecommitdiffstats
path: root/catalog-ui/src/app/ng2/shared/checkbox
diff options
context:
space:
mode:
authorMichael Lando <ml636r@att.com>2017-06-17 22:40:44 +0300
committerMichael Lando <ml636r@att.com>2017-06-18 07:20:49 +0300
commit4d97d5fac309ce0d66938e5ccd0349e2660d4e23 (patch)
tree3f921054f997d1962fa6f9db9a0119e31a851eea /catalog-ui/src/app/ng2/shared/checkbox
parent89786d31f266a205857cae0177904c249ac6a512 (diff)
[sdc] update code of sdc
Change-Id: If9f37c80b659cb67b34d18e6c019defecca58b9a Signed-off-by: Michael Lando <ml636r@att.com>
Diffstat (limited to 'catalog-ui/src/app/ng2/shared/checkbox')
-rw-r--r--catalog-ui/src/app/ng2/shared/checkbox/checkbox.component.html2
-rw-r--r--catalog-ui/src/app/ng2/shared/checkbox/checkbox.component.less9
-rw-r--r--catalog-ui/src/app/ng2/shared/checkbox/checkbox.component.ts20
3 files changed, 17 insertions, 14 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 {