fix(primeng/p-button): classes for custom icon template, normalize he…

…ight Fixes #13139.
primefaces · Sep 23, 2023 · 2d2786d · 2d2786d
1 parent 396297a
commit 2d2786d
Show file tree

Hide file tree

Showing 14 changed files with 14 additions and 1 deletion.
diff --git a/src/app/components/button/button.ts b/src/app/components/button/button.ts
@@ -393,7 +393,7 @@ export class Button implements AfterContentInit {
             'p-button-vertical': (this.iconPos === 'top' || this.iconPos === 'bottom') && this.label,
             'p-disabled': this.disabled || this.loading,
             'p-button-loading': this.loading,
-            'p-button-loading-label-only': this.loading && !this.icon && this.label && !this.loadingIcon && this.iconPos === 'left'
+            'p-button-loading-label-only': this.loading && !(this.icon || this.iconTemplate) && this.label && !this.loadingIcon && this.iconPos === 'left'
         };
     }
 

diff --git a/src/assets/components/themes/lara-dark-blue/theme.css b/src/assets/components/themes/lara-dark-blue/theme.css
@@ -2017,6 +2017,7 @@ p-treeselect.p-treeselect-clearable .p-treeselect-clear-icon {
 .p-button.p-button-icon-only {
   width: 3rem;
   padding: 0.75rem 0;
+  height: 2.85rem;
 }
 .p-button.p-button-icon-only .p-button-icon-left,
 .p-button.p-button-icon-only .p-button-icon-right {

diff --git a/src/assets/components/themes/lara-dark-indigo/theme.css b/src/assets/components/themes/lara-dark-indigo/theme.css
@@ -2017,6 +2017,7 @@ p-treeselect.p-treeselect-clearable .p-treeselect-clear-icon {
 .p-button.p-button-icon-only {
   width: 3rem;
   padding: 0.75rem 0;
+  height: 2.85rem;
 }
 .p-button.p-button-icon-only .p-button-icon-left,
 .p-button.p-button-icon-only .p-button-icon-right {

diff --git a/src/assets/components/themes/lara-dark-purple/theme.css b/src/assets/components/themes/lara-dark-purple/theme.css
@@ -2017,6 +2017,7 @@ p-treeselect.p-treeselect-clearable .p-treeselect-clear-icon {
 .p-button.p-button-icon-only {
   width: 3rem;
   padding: 0.75rem 0;
+  height: 2.85rem;
 }
 .p-button.p-button-icon-only .p-button-icon-left,
 .p-button.p-button-icon-only .p-button-icon-right {

diff --git a/src/assets/components/themes/lara-dark-teal/theme.css b/src/assets/components/themes/lara-dark-teal/theme.css
@@ -2017,6 +2017,7 @@ p-treeselect.p-treeselect-clearable .p-treeselect-clear-icon {
 .p-button.p-button-icon-only {
   width: 3rem;
   padding: 0.75rem 0;
+  height: 2.85rem;
 }
 .p-button.p-button-icon-only .p-button-icon-left,
 .p-button.p-button-icon-only .p-button-icon-right {

diff --git a/src/assets/components/themes/lara-light-blue/theme.css b/src/assets/components/themes/lara-light-blue/theme.css
@@ -2017,6 +2017,7 @@ p-treeselect.p-treeselect-clearable .p-treeselect-clear-icon {
 .p-button.p-button-icon-only {
   width: 3rem;
   padding: 0.75rem 0;
+  height: 2.85rem;
 }
 .p-button.p-button-icon-only .p-button-icon-left,
 .p-button.p-button-icon-only .p-button-icon-right {

diff --git a/src/assets/components/themes/lara-light-indigo/theme.css b/src/assets/components/themes/lara-light-indigo/theme.css
@@ -2017,6 +2017,7 @@ p-treeselect.p-treeselect-clearable .p-treeselect-clear-icon {
 .p-button.p-button-icon-only {
   width: 3rem;
   padding: 0.75rem 0;
+  height: 2.85rem;
 }
 .p-button.p-button-icon-only .p-button-icon-left,
 .p-button.p-button-icon-only .p-button-icon-right {

diff --git a/src/assets/components/themes/lara-light-purple/theme.css b/src/assets/components/themes/lara-light-purple/theme.css
@@ -2017,6 +2017,7 @@ p-treeselect.p-treeselect-clearable .p-treeselect-clear-icon {
 .p-button.p-button-icon-only {
   width: 3rem;
   padding: 0.75rem 0;
+  height: 2.85rem;
 }
 .p-button.p-button-icon-only .p-button-icon-left,
 .p-button.p-button-icon-only .p-button-icon-right {

diff --git a/src/assets/components/themes/lara-light-teal/theme.css b/src/assets/components/themes/lara-light-teal/theme.css
@@ -2017,6 +2017,7 @@ p-treeselect.p-treeselect-clearable .p-treeselect-clear-icon {
 .p-button.p-button-icon-only {
   width: 3rem;
   padding: 0.75rem 0;
+  height: 2.85rem;
 }
 .p-button.p-button-icon-only .p-button-icon-left,
 .p-button.p-button-icon-only .p-button-icon-right {

diff --git a/src/assets/components/themes/soho-dark/theme.css b/src/assets/components/themes/soho-dark/theme.css
@@ -2023,6 +2023,7 @@ p-treeselect.p-treeselect-clearable .p-treeselect-clear-icon {
 .p-button.p-button-icon-only {
   width: 3rem;
   padding: 0.75rem 0;
+  height: 2.85rem;
 }
 .p-button.p-button-icon-only .p-button-icon-left,
 .p-button.p-button-icon-only .p-button-icon-right {

diff --git a/src/assets/components/themes/soho-light/theme.css b/src/assets/components/themes/soho-light/theme.css
@@ -2023,6 +2023,7 @@ p-treeselect.p-treeselect-clearable .p-treeselect-clear-icon {
 .p-button.p-button-icon-only {
   width: 3rem;
   padding: 0.75rem 0;
+  height: 2.85rem;
 }
 .p-button.p-button-icon-only .p-button-icon-left,
 .p-button.p-button-icon-only .p-button-icon-right {

diff --git a/src/assets/components/themes/tailwind-light/theme.css b/src/assets/components/themes/tailwind-light/theme.css
@@ -2028,6 +2028,7 @@ p-treeselect.p-treeselect-clearable .p-treeselect-clear-icon {
 .p-button.p-button-icon-only {
   width: 3rem;
   padding: 0.75rem 0;
+  height: 2.85rem;
 }
 .p-button.p-button-icon-only .p-button-icon-left,
 .p-button.p-button-icon-only .p-button-icon-right {

diff --git a/src/assets/showcase/styles/layout/landing/themes/lara-dark-blue/theme.css b/src/assets/showcase/styles/layout/landing/themes/lara-dark-blue/theme.css
@@ -868,6 +868,7 @@
 .landing-themes .p-button.p-button-icon-only {
   width: 3rem;
   padding: 0.75rem 0;
+  height: 2.85rem;
 }
 .landing-themes .p-button.p-button-icon-only .p-button-icon-left,
 .landing-themes .p-button.p-button-icon-only .p-button-icon-right {

diff --git a/src/assets/showcase/styles/layout/landing/themes/lara-light-blue/theme.css b/src/assets/showcase/styles/layout/landing/themes/lara-light-blue/theme.css
@@ -865,6 +865,7 @@
 .landing-themes .p-button.p-button-icon-only {
   width: 3rem;
   padding: 0.75rem 0;
+  height: 2.85rem;
 }
 .landing-themes .p-button.p-button-icon-only .p-button-icon-left,
 .landing-themes .p-button.p-button-icon-only .p-button-icon-right {