From 5f621abfcf4e00dd957bb14da8ad101c96f47c5b Mon Sep 17 00:00:00 2001 From: Tim Lancina Date: Thu, 24 Mar 2016 18:05:36 -0500 Subject: [PATCH 1/4] fix(button): normalize generated button class names Addresses https://github.com/driftyco/ionic/issues/5938. --- ionic/components/button/button.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ionic/components/button/button.ts b/ionic/components/button/button.ts index bb7abca204..71535ddfa4 100644 --- a/ionic/components/button/button.ts +++ b/ionic/components/button/button.ts @@ -300,7 +300,7 @@ export class Button { */ private _setClass(type: string, assignCssClass: boolean) { if (type && this._init) { - this._renderer.setElementClass(this._elementRef.nativeElement, this._role + '-' + type, assignCssClass); + this._renderer.setElementClass(this._elementRef.nativeElement, this._role + '-' + type.toLowerCase(), assignCssClass); } } From 442d135daec425f20a43a0e705258c4d88d4f411 Mon Sep 17 00:00:00 2001 From: "Manu Mtz.-Almeida" Date: Wed, 30 Mar 2016 21:07:32 +0200 Subject: [PATCH 2/4] feat(ion-content): adds for non-scrollable page content closes #5987 --- ionic/components/app/structure.scss | 3 ++- ionic/components/content/content.scss | 9 +++++++++ ionic/components/content/content.ts | 1 + ionic/components/nav/test/basic/index.ts | 10 ++++++++++ ionic/transitions/transition-ios.ts | 2 +- 5 files changed, 23 insertions(+), 2 deletions(-) diff --git a/ionic/components/app/structure.scss b/ionic/components/app/structure.scss index f17ca779f8..9467f3c9c1 100644 --- a/ionic/components/app/structure.scss +++ b/ionic/components/app/structure.scss @@ -9,6 +9,7 @@ $z-index-menu-backdrop: 79; $z-index-overlay: 1000; $z-index-click-block: 9999; +$z-index-fixed-content: 2; $z-index-scroll-content: 1; $z-index-refresher: 0; @@ -20,7 +21,7 @@ $z-index-toolbar-background: -1; $z-index-toolbar-border: 20; $z-index-list-border: 50; -$z-index-backdrop: 1; +$z-index-backdrop: 2; $z-index-overlay-wrapper: 10; $z-index-item-options: 1; diff --git a/ionic/components/content/content.scss b/ionic/components/content/content.scss index 146cec1e31..c57c4f22dc 100644 --- a/ionic/components/content/content.scss +++ b/ionic/components/content/content.scss @@ -18,3 +18,12 @@ [no-margin] { margin: 0; } + +// Content Fixed +// -------------------------------------------------- + +ion-fixed { + position: absolute; + transform: translateZ(0); + z-index: $z-index-fixed-content; +} diff --git a/ionic/components/content/content.ts b/ionic/components/content/content.ts index 026ae8dbd2..f6068b51d5 100644 --- a/ionic/components/content/content.ts +++ b/ionic/components/content/content.ts @@ -31,6 +31,7 @@ import {ScrollTo} from '../../animations/scroll-to'; '' + '' + '' + + '' + '' }) export class Content extends Ion { diff --git a/ionic/components/nav/test/basic/index.ts b/ionic/components/nav/test/basic/index.ts index 99f5a488a2..8300ac02bf 100644 --- a/ionic/components/nav/test/basic/index.ts +++ b/ionic/components/nav/test/basic/index.ts @@ -207,6 +207,10 @@ class FullPage {

+ + + + ` }) @@ -240,6 +244,12 @@ class PrimaryHeaderPage { this.nav.setRoot(AnotherPage); } + presentAlert() { + let alert = Alert.create(); + alert.setTitle('Hello Alert'); + alert.addButton({ text: 'Dismiss', role: 'cancel', }); + this.nav.present(alert); + } } diff --git a/ionic/transitions/transition-ios.ts b/ionic/transitions/transition-ios.ts index d98b4838ac..431898a793 100644 --- a/ionic/transitions/transition-ios.ts +++ b/ionic/transitions/transition-ios.ts @@ -171,7 +171,7 @@ class IOSTransition extends Transition { // should just slide out, no fading out leavingNavbarBg .before.clearStyles([OPACITY]) - .fromTo(TRANSLATEX, CENTER, '100%'); + .fromTo(TRANSLATEX, CENTER, '100%'); } let leavingBackBtnText = new Animation(leavingView.backBtnTextRef()); From b1226cbb41960a77beee9504d5413098c25f30ae Mon Sep 17 00:00:00 2001 From: Rob Date: Wed, 30 Mar 2016 19:54:15 -0500 Subject: [PATCH 3/4] segment.wp: display active style outside toolbar In the iOS and Android styles the segment-activated class lives directly under segment-button. However in the Windows Phone version these styles live only under toolbar, causing the styles to not be applied properly if the ion-segment is used outside of a toolbar. --- ionic/components/segment/segment.wp.scss | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/ionic/components/segment/segment.wp.scss b/ionic/components/segment/segment.wp.scss index bfc00f377a..eae6abc7e0 100644 --- a/ionic/components/segment/segment.wp.scss +++ b/ionic/components/segment/segment.wp.scss @@ -39,6 +39,11 @@ ion-segment { color: $segment-button-wp-text-color-activated; background-color: $segment-button-wp-background-color; opacity: $segment-button-wp-opacity; + + .activated, + .segment-activated { + opacity: $segment-button-wp-opacity-activated; + } ion-icon { font-size: $segment-button-wp-icon-size; @@ -51,12 +56,6 @@ ion-segment { ion-segment { margin: 0 auto; } - - .segment-button.activated, - .segment-button.segment-activated { - opacity: $segment-button-wp-opacity-activated; - } - } From 87a8f8dbc1a1688b8842203a3ec96c29780638ae Mon Sep 17 00:00:00 2001 From: Rob Date: Wed, 30 Mar 2016 20:05:55 -0500 Subject: [PATCH 4/4] match syntax of ios.scss file Updated the syntax of the fix to match ios style --- ionic/components/segment/segment.wp.scss | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ionic/components/segment/segment.wp.scss b/ionic/components/segment/segment.wp.scss index eae6abc7e0..464df8f8cd 100644 --- a/ionic/components/segment/segment.wp.scss +++ b/ionic/components/segment/segment.wp.scss @@ -40,8 +40,7 @@ ion-segment { background-color: $segment-button-wp-background-color; opacity: $segment-button-wp-opacity; - .activated, - .segment-activated { + &.segment-activated { opacity: $segment-button-wp-opacity-activated; }