diff --git a/packages/core/src/components/card-content/card-content.scss b/packages/core/src/components/card-content/card-content.scss index 8201e48c79..4256f79615 100644 --- a/packages/core/src/components/card-content/card-content.scss +++ b/packages/core/src/components/card-content/card-content.scss @@ -5,7 +5,6 @@ // -------------------------------------------------- ion-card-content { - display: block; - position: relative; + display: block; } diff --git a/packages/core/src/components/card-header/card-header.scss b/packages/core/src/components/card-header/card-header.scss index e5f9b665e4..d86bbb7b67 100644 --- a/packages/core/src/components/card-header/card-header.scss +++ b/packages/core/src/components/card-header/card-header.scss @@ -6,11 +6,10 @@ ion-card-header { + position: relative; display: block; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; - - position: relative; } diff --git a/packages/core/src/components/card-subtitle/card-subtitle.ios.scss b/packages/core/src/components/card-subtitle/card-subtitle.ios.scss index dbd7d01350..1f16c42b89 100644 --- a/packages/core/src/components/card-subtitle/card-subtitle.ios.scss +++ b/packages/core/src/components/card-subtitle/card-subtitle.ios.scss @@ -39,8 +39,8 @@ $card-ios-subtitle-color: rgba(0, 0, 0, 0.4) !default; font-size: $card-ios-subtitle-font-size; font-weight: $card-ios-subtitle-font-weight; - text-transform: $card-ios-subtitle-text-transform; letter-spacing: $card-ios-subtitle-letter-spacing; + text-transform: $card-ios-subtitle-text-transform; color: $card-ios-subtitle-color; } diff --git a/packages/core/src/components/card-subtitle/card-subtitle.scss b/packages/core/src/components/card-subtitle/card-subtitle.scss index 4746bbb0bd..7ca1e58b0b 100644 --- a/packages/core/src/components/card-subtitle/card-subtitle.scss +++ b/packages/core/src/components/card-subtitle/card-subtitle.scss @@ -5,7 +5,6 @@ // -------------------------------------------------- ion-card-subtitle { - display: block; - position: relative; + display: block; } diff --git a/packages/core/src/components/card-title/card-title.scss b/packages/core/src/components/card-title/card-title.scss index 181be5fb01..8adbb3154c 100644 --- a/packages/core/src/components/card-title/card-title.scss +++ b/packages/core/src/components/card-title/card-title.scss @@ -5,7 +5,6 @@ // -------------------------------------------------- ion-card-title { - display: block; - position: relative; + display: block; } diff --git a/packages/core/src/components/card/card.scss b/packages/core/src/components/card/card.scss index bade41dd71..84c01a5949 100755 --- a/packages/core/src/components/card/card.scss +++ b/packages/core/src/components/card/card.scss @@ -5,8 +5,8 @@ ion-card { - display: block; position: relative; + display: block; overflow: hidden; } diff --git a/packages/core/src/components/loading/loading.tsx b/packages/core/src/components/loading/loading.tsx index b09a6cea9f..5343b68e6f 100644 --- a/packages/core/src/components/loading/loading.tsx +++ b/packages/core/src/components/loading/loading.tsx @@ -183,10 +183,7 @@ export class Loading { } protected render() { - let userCssClass = 'loading-content'; - if (this.cssClass) { - userCssClass += ' ' + this.cssClass; - } + // TODO: cssClass const loadingInner: any[] = []; @@ -239,4 +236,4 @@ export interface LoadingEvent extends Event { }; } -export { iOSEnterAnimation, iOSLeaveAnimation } +export { iOSEnterAnimation, iOSLeaveAnimation }; diff --git a/packages/core/src/components/menu-controller/menu-controller.ts b/packages/core/src/components/menu-controller/menu-controller.ts index 88265388d2..150c81412d 100644 --- a/packages/core/src/components/menu-controller/menu-controller.ts +++ b/packages/core/src/components/menu-controller/menu-controller.ts @@ -261,4 +261,4 @@ export class MenuController { } -export { MenuOverlayAnimation, MenuPushAnimation, MenuRevealAnimation } \ No newline at end of file +export { MenuOverlayAnimation, MenuPushAnimation, MenuRevealAnimation }; diff --git a/packages/core/src/components/picker/picker.ios.scss b/packages/core/src/components/picker/picker.ios.scss index 99bcbc142d..dc0ab50425 100644 --- a/packages/core/src/components/picker/picker.ios.scss +++ b/packages/core/src/components/picker/picker.ios.scss @@ -115,7 +115,7 @@ $picker-ios-option-offset-y: (($picker-ios-height - $picker-io font-weight: $picker-ios-button-strong-font-weight; } -.picker-ios .picker-toolbar-button:first-child{ +.picker-ios .picker-toolbar-button:first-child { @include text-align(start); font-weight: normal; @@ -128,10 +128,9 @@ $picker-ios-option-offset-y: (($picker-ios-height - $picker-io height: $picker-ios-button-height; + font-size: $picker-ios-button-font-size; color: $picker-ios-button-text-color; background: $picker-ios-button-background-color; - - font-size: $picker-ios-button-font-size; } .picker-columns { @@ -161,6 +160,11 @@ $picker-ios-option-offset-y: (($picker-ios-height - $picker-io } .picker-ios .picker-opt { + @include padding( + $picker-ios-option-padding-top, + $picker-ios-option-padding-end, + $picker-ios-option-padding-bottom, + $picker-ios-option-padding-start); @include margin(0); @include transform-origin(center, center); @@ -177,8 +181,6 @@ $picker-ios-option-offset-y: (($picker-ios-height - $picker-io backface-visibility: hidden; pointer-events: auto; - - @include padding($picker-ios-option-padding-top, $picker-ios-option-padding-end, $picker-ios-option-padding-bottom, $picker-ios-option-padding-start); } .picker-ios .picker-above-highlight { @@ -216,4 +218,4 @@ $picker-ios-option-offset-y: (($picker-ios-height - $picker-io background: linear-gradient(to top, rgba($picker-ios-background-color, 1) 30%, rgba($picker-ios-background-color, .7) 100%); -} \ No newline at end of file +} diff --git a/packages/core/src/components/picker/picker.md.scss b/packages/core/src/components/picker/picker.md.scss index 9790b3acb6..02ae10fd1e 100644 --- a/packages/core/src/components/picker/picker.md.scss +++ b/packages/core/src/components/picker/picker.md.scss @@ -93,17 +93,15 @@ $picker-md-option-selected-color: color($colors-md, primary) !defaul .picker-md .picker-button, .picker-md .picker-button.activated { @include margin(0); + @include padding(0, 1.1em); height: $picker-md-button-height; - color: $picker-md-button-text-color; - background: $picker-md-button-background-color; - font-size: $picker-md-button-font-size; font-weight: 500; text-transform: uppercase; - padding: 0 1.1em; - + color: $picker-md-button-text-color; + background: $picker-md-button-background-color; box-shadow: none; } @@ -192,4 +190,4 @@ $picker-md-option-selected-color: color($colors-md, primary) !defaul background: linear-gradient(to top, rgba($picker-md-background-color, 1) 30%, rgba($picker-md-background-color, .7) 100%); -} \ No newline at end of file +} diff --git a/packages/core/src/components/picker/picker.tsx b/packages/core/src/components/picker/picker.tsx index 4a8a916f51..c5c19c3b68 100644 --- a/packages/core/src/components/picker/picker.tsx +++ b/packages/core/src/components/picker/picker.tsx @@ -18,7 +18,6 @@ export class Picker { private animation: Animation; private durationTimeout: any; private mode: string; - private lastClick: number = 0; @Element() private el: HTMLElement; @@ -193,8 +192,6 @@ export class Picker { // } // keep the time of the most recent button click - this.lastClick = Date.now(); - let shouldDismiss = true; if (button.handler) { @@ -263,10 +260,7 @@ export class Picker { } protected render() { - let userCssClass = 'picker-content'; - if (this.cssClass) { - userCssClass += ' ' + this.cssClass; - } + // TODO: cssClass let buttons = this.buttons .map(b => { @@ -346,12 +340,12 @@ export class Picker { )} -