javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2025-11-09 16:16:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(buttons): fix activated, position, animation

Browse Source
This commit is contained in:
Manu Mtz.-Almeida
2018-09-25 18:35:19 +02:00
parent 633360fcba
commit 9d6169acdd
10 changed files with 25 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
core/src/components/buttons/buttons.ios.scss
View File

@ -5,7 +5,7 @@
// iOS Toolbar Default Button
// --------------------------------------------------
::slotted(*) .button {
::slotted(*) ion-button {
--padding-top: 0;
--padding-bottom: 0;
--padding-start: 5px;
@ -29,14 +29,6 @@
}
// iOS Toolbar Clear Button
// --------------------------------------------------
::slotted(*) .button-clear.activated {
color: $toolbar-ios-button-color;
}
// iOS Toolbar Button Solid
// --------------------------------------------------
@ -56,7 +48,6 @@
font-size: 24px;
line-height: .67;
pointer-events: none;
}
::slotted(*) ion-icon[slot="end"] {
@ -66,7 +57,6 @@
font-size: 24px;
line-height: .67;
pointer-events: none;
}
::slotted(*) ion-icon[slot="icon-only"] {
@ -76,7 +66,6 @@
font-size: 31px;
line-height: .67;
pointer-events: none;
}

5
core/src/components/buttons/buttons.md.scss
View File

@ -4,7 +4,7 @@
// Material Design Toolbar Default Button
// --------------------------------------------------
::slotted(*) .button {
::slotted(*) ion-button {
--padding-top: 0;
--padding-bottom: 0;
--padding-start: 8px;
@ -70,7 +70,6 @@
@include margin-horizontal(null, .3em);
font-size: 1.4em;
pointer-events: none;
}
::slotted(*) ion-icon[slot="end"] {
@ -78,7 +77,6 @@
@include margin-horizontal(.4em, null);
font-size: 1.4em;
pointer-events: none;
}
::slotted(*) ion-icon[slot="icon-only"] {
@ -86,7 +84,6 @@
@include margin(0);
font-size: 1.8em;
pointer-events: none;
}

3
core/src/components/buttons/buttons.scss
View File

@ -8,7 +8,6 @@
transform: translateZ(0);
z-index: $z-index-toolbar-buttons;
pointer-events: none;
}
// Toolbar Buttons
@ -26,6 +25,4 @@
--box-shadow: none;
@include margin-horizontal(2px, 2px);
}