diff --git a/src/components/datetime/test/issues/app.module.ts b/src/components/datetime/test/issues/app.module.ts
index fcd7af452f..c3ddf7de09 100644
--- a/src/components/datetime/test/issues/app.module.ts
+++ b/src/components/datetime/test/issues/app.module.ts
@@ -21,7 +21,6 @@ export class E2EPage {
}
}
-
@Component({
template: ''
})
diff --git a/src/components/split-pane/split-pane.ios.scss b/src/components/split-pane/split-pane.ios.scss
index 59daf3d997..c12a5e673e 100644
--- a/src/components/split-pane/split-pane.ios.scss
+++ b/src/components/split-pane/split-pane.ios.scss
@@ -4,9 +4,17 @@
// Split Pane
// --------------------------------------------------
+$split-pane-ios-border: $hairlines-width solid $list-ios-border-color;
+
.split-pane-ios.split-pane-visible >.split-pane-side {
min-width: 270px;
max-width: 28%;
- border-right: $hairlines-width solid $list-ios-border-color;
+ border-right: $split-pane-ios-border;
+ border-left: 0;
+}
+
+.split-pane-ios.split-pane-visible > .split-pane-side[side=right] {
+ border-right: 0;
+ border-left: $split-pane-ios-border;
}
diff --git a/src/components/split-pane/split-pane.md.scss b/src/components/split-pane/split-pane.md.scss
index e9a76e2d9b..7d4cf0995d 100644
--- a/src/components/split-pane/split-pane.md.scss
+++ b/src/components/split-pane/split-pane.md.scss
@@ -4,10 +4,17 @@
// Split Pane
// --------------------------------------------------
+$split-pane-md-border: 1px solid $list-md-border-color;
+
.split-pane-md.split-pane-visible >.split-pane-side {
min-width: 270px;
max-width: 28%;
- border-right: 1px solid $list-md-border-color;
+ border-right: $split-pane-md-border;
+ border-left: 0;
}
+.split-pane-md.split-pane-visible > .split-pane-side[side=right] {
+ border-right: 0;
+ border-left: $split-pane-md-border;
+}
diff --git a/src/components/split-pane/split-pane.scss b/src/components/split-pane/split-pane.scss
index 539d998234..e679b708af 100644
--- a/src/components/split-pane/split-pane.scss
+++ b/src/components/split-pane/split-pane.scss
@@ -72,3 +72,7 @@ ion-split-pane {
display: hidden !important;
}
}
+
+.split-pane-visible >.split-pane-side[side=right] {
+ order: 1;
+}
diff --git a/src/components/split-pane/split-pane.wp.scss b/src/components/split-pane/split-pane.wp.scss
index 49f91aa36b..52e461ab8d 100644
--- a/src/components/split-pane/split-pane.wp.scss
+++ b/src/components/split-pane/split-pane.wp.scss
@@ -4,9 +4,17 @@
// Split Pane
// --------------------------------------------------
+$split-pane-wp-border: 1px solid $list-wp-border-color;
+
.split-pane-wp.split-pane-visible >.split-pane-side {
min-width: 270px;
max-width: 28%;
- border-right: 1px solid $list-wp-border-color;
+ border-right: $split-pane-wp-border;
+ border-left: 0;
+}
+
+.split-pane-wp.split-pane-visible > .split-pane-side[side=right] {
+ border-right: 0;
+ border-left: $split-pane-wp-border;
}
diff --git a/src/components/split-pane/test/menus/app.module.ts b/src/components/split-pane/test/menus/app.module.ts
index 7d817418ce..f7d874a30a 100644
--- a/src/components/split-pane/test/menus/app.module.ts
+++ b/src/components/split-pane/test/menus/app.module.ts
@@ -35,6 +35,8 @@ export class E2EPage2 {}
+
+
@@ -49,20 +51,33 @@ export class E2EPage {
constructor(
public navCtrl: NavController,
public menuCtrl: MenuController,
- ) { }
+ ) {
+ this.menuCtrl.enable(false, 'menu4');
+ }
push() {
this.navCtrl.push(E2EPage2);
}
+
menu1Active() {
+ this.menuCtrl.enable(false, 'menu4');
this.menuCtrl.enable(true, 'menu1');
}
menu2Active() {
+ this.menuCtrl.enable(false, 'menu4');
this.menuCtrl.enable(true, 'menu2');
}
menu3Active() {
+ this.menuCtrl.enable(false, 'menu4');
this.menuCtrl.enable(true, 'menu3');
}
+ menu4Active() {
+ this.menuCtrl.enable(false, 'menu1');
+ this.menuCtrl.enable(false, 'menu2');
+ this.menuCtrl.enable(false, 'menu3');
+
+ this.menuCtrl.enable(true, 'menu4');
+ }
disableAll() {
this.menuCtrl.enable(false);
}
diff --git a/src/components/split-pane/test/menus/main.html b/src/components/split-pane/test/menus/main.html
index 353e613197..738983577e 100644
--- a/src/components/split-pane/test/menus/main.html
+++ b/src/components/split-pane/test/menus/main.html
@@ -48,5 +48,20 @@
+
+
\ No newline at end of file
diff --git a/src/components/split-pane/test/tabs/app.module.ts b/src/components/split-pane/test/tabs/app.module.ts
index c28f385002..a09d320ae6 100644
--- a/src/components/split-pane/test/tabs/app.module.ts
+++ b/src/components/split-pane/test/tabs/app.module.ts
@@ -8,6 +8,7 @@ import { IonicApp, IonicModule, NavController, MenuController } from '../../../.
Navigation
+
@@ -47,6 +48,7 @@ export class SidePage {
+
@@ -57,6 +59,7 @@ export class SidePage {
`
})
export class E2EPage {
+
constructor(
public navCtrl: NavController,
public menuCtrl: MenuController,
@@ -74,6 +77,7 @@ export class E2EPage {
export class E2EApp {
root = E2EPage;
root2 = SidePage;
+ side = 'right';
}
@NgModule({
diff --git a/src/components/split-pane/test/tabs/main.html b/src/components/split-pane/test/tabs/main.html
index 342508f5a6..55dbb50d39 100644
--- a/src/components/split-pane/test/tabs/main.html
+++ b/src/components/split-pane/test/tabs/main.html
@@ -1,7 +1,7 @@
-
+