fix(button): fix iconAddonAfter

TemainfoSoftware · Jul 29, 2019 · 6790740 · 6790740
1 parent 4d14b8f
commit 6790740
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/projects/truly-ui/src/components/button/button.html b/projects/truly-ui/src/components/button/button.html
@@ -20,9 +20,9 @@
     <tl-icon *ngIf="iconAfterText">{{ iconAfterText }}</tl-icon>
   </div>
   <tl-icon *ngIf="iconAddonAfter"
-           [style.color]="colorIconAfter"
            [class]="color + ' iconAddonAfter'"
-           [ngStyle]="{'line-height': 'calc(' + height + ' - 1px)'}">{{ iconAddonAfter }}
+           [ngStyle]="{'line-height': 'calc(' + height + ' - 1px)'}"
+           [style.color]="colorIconAfter">{{ iconAddonAfter }}
   </tl-icon>
 </ng-template>
 
diff --git a/projects/truly-ui/src/components/button/button.scss b/projects/truly-ui/src/components/button/button.scss
@@ -12,19 +12,17 @@ $button-text-align: center;
   padding: 0;
   margin: 0;
   outline: none;
-  display: inline-block;
+  display: flex;
   cursor: pointer;
   box-sizing: border-box;
 
   > .iconAddonBefore {
     box-sizing: border-box;
-    float: left;
     padding: 0 15px;
     pointer-events: none;
   }
   > .iconAddonAfter {
     box-sizing: border-box;
-    float: right;
     padding: 0 15px;
     pointer-events: none;
   }