javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2025-08-23 05:58:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(split-pane): fixes flex

Browse Source
This commit is contained in:
Manu Mtz.-Almeida
2017-11-19 03:58:50 +01:00
parent 0134d11245
commit b708bf91eb
2 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/core/src/components/menu/menu.tsx
View File

@ -429,7 +429,7 @@ export class Menu {
return { return {
role: 'complementary', role: 'complementary',
class: { class: {
'menu-enabled': this.isActive(), 'menu-enabled': this.enabled,
'menu-side-right': this.isRightSide, 'menu-side-right': this.isRightSide,
'menu-side-left': !this.isRightSide, 'menu-side-left': !this.isRightSide,
[typeClass]: true, [typeClass]: true,

14
packages/core/src/components/split-pane/split-pane.scss
View File

@ -20,10 +20,6 @@ $split-pane-side-max-width: 28% !default;
contain: strict; contain: strict;
} }
.split-pane-side:not(ion-menu) {
display: none;
}
.split-pane-visible >.split-pane-side, .split-pane-visible >.split-pane-side,
.split-pane-visible >.split-pane-main { .split-pane-visible >.split-pane-main {
@include position(0, 0, 0, 0); @include position(0, 0, 0, 0);
@ -44,15 +40,11 @@ $split-pane-side-max-width: 28% !default;
order: -1; order: -1;
} }
.split-pane-visible >.split-pane-main, .split-pane-side:not(ion-menu) {
.split-pane-visible >ion-nav.split-pane-side, display: none;
.split-pane-visible >ion-tabs.split-pane-side,
.split-pane-visible >ion-menu.menu-enabled {
display: block;
} }
.split-pane-visible >ion-split-pane.split-pane-side, .split-pane-visible > .split-pane-side {
.split-pane-visible >ion-split-pane.split-pane-main {
display: flex; display: flex;
} }