javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2025-08-20 04:14:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(button): improve text style inherency

Browse Source 
related #14927
This commit is contained in:
Manu Mtz.-Almeida
2018-07-29 13:19:16 +02:00
parent 92e21a8cf3
commit 25423a06f2
3 changed files with 5 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
core/src/components/button/button.scss
View File

@ -109,6 +109,7 @@
.button-native { .button-native {
@include text-inherit();
@include border-radius(var(--border-radius)); @include border-radius(var(--border-radius));
@include font-smoothing(); @include font-smoothing();
@include margin(var(--margin-top), var(--margin-end), var(--margin-bottom), var(--margin-start)); @include margin(var(--margin-top), var(--margin-end), var(--margin-bottom), var(--margin-start));
@ -126,22 +127,9 @@
border-color: var(--border-color); border-color: var(--border-color);
background: var(--background); background: var(--background);
color: inherit;
font-family: inherit;
font-size: inherit;
font-weight: inherit;
letter-spacing: inherit;
line-height: 1; line-height: 1;
text-align: inherit;
text-decoration: inherit;
text-overflow: inherit;
text-transform: inherit;
white-space: inherit;
box-shadow: var(--box-shadow); box-shadow: var(--box-shadow);
contain: content; contain: content;
cursor: pointer; cursor: pointer;

12
core/src/components/item/item.scss
View File

@ -35,7 +35,9 @@
color: #{current-color(contrast)}; color: #{current-color(contrast)};
text-align: initial;
text-decoration: none; text-decoration: none;
box-sizing: border-box; box-sizing: border-box;
} }
@ -54,7 +56,7 @@
@include padding(var(--padding-top), var(--padding-end), var(--padding-bottom), var(--padding-start)); @include padding(var(--padding-top), var(--padding-end), var(--padding-bottom), var(--padding-start));
@include border-radius(var(--border-radius)); @include border-radius(var(--border-radius));
@include margin(0); @include margin(0);
@include text-align(initial); @include text-inherit();
display: flex; display: flex;
position: relative; position: relative;
@ -74,14 +76,6 @@
outline: none; outline: none;
background-color: var(--background); 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); box-shadow: var(--box-shadow);
overflow: hidden; overflow: hidden;

1
core/src/themes/ionic.mixins.scss
View File

@ -23,6 +23,7 @@
text-decoration: inherit; text-decoration: inherit;
text-overflow: inherit; text-overflow: inherit;
text-transform: inherit; text-transform: inherit;
text-align: inherit;
white-space: inherit; white-space: inherit;
color: inherit; color: inherit;
} }