Skip to content

Commit

Permalink
fix(button): improve text style inherency
Browse files Browse the repository at this point in the history
related #14927
  • Loading branch information
manucorporat committed Jul 29, 2018
1 parent 92e21a8 commit 25423a0
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 22 deletions.
14 changes: 1 addition & 13 deletions core/src/components/button/button.scss
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,7 @@


.button-native {
@include text-inherit();
@include border-radius(var(--border-radius));
@include font-smoothing();
@include margin(var(--margin-top), var(--margin-end), var(--margin-bottom), var(--margin-start));
Expand All @@ -126,22 +127,9 @@
border-color: var(--border-color);

background: var(--background);
color: inherit;

font-family: inherit;
font-size: inherit;
font-weight: inherit;

letter-spacing: inherit;
line-height: 1;

text-align: inherit;
text-decoration: inherit;
text-overflow: inherit;
text-transform: inherit;

white-space: inherit;

box-shadow: var(--box-shadow);
contain: content;
cursor: pointer;
Expand Down
12 changes: 3 additions & 9 deletions core/src/components/item/item.scss
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,9 @@

color: #{current-color(contrast)};

text-align: initial;
text-decoration: none;

box-sizing: border-box;
}

Expand All @@ -54,7 +56,7 @@
@include padding(var(--padding-top), var(--padding-end), var(--padding-bottom), var(--padding-start));
@include border-radius(var(--border-radius));
@include margin(0);
@include text-align(initial);
@include text-inherit();

display: flex;
position: relative;
Expand All @@ -74,14 +76,6 @@
outline: none;

background-color: var(--background);
color: inherit;

font-family: inherit;
font-size: inherit;
font-weight: inherit;

text-decoration: inherit;
text-transform: inherit;

box-shadow: var(--box-shadow);
overflow: hidden;
Expand Down
1 change: 1 addition & 0 deletions core/src/themes/ionic.mixins.scss
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
text-decoration: inherit;
text-overflow: inherit;
text-transform: inherit;
text-align: inherit;
white-space: inherit;
color: inherit;
}
Expand Down

0 comments on commit 25423a0

Please sign in to comment.