diff --git a/dist/framework.css b/dist/framework.css index 43eae6806b..3fa899d3c0 100644 --- a/dist/framework.css +++ b/dist/framework.css @@ -233,7 +233,7 @@ a.list-item { display: block; width: 270px; } -header, main, footer { +.bar-header, .content, .bar-footer { z-index: 100; left: 0; right: 0; @@ -244,9 +244,9 @@ header, main, footer { -moz-transform: translate3d(0, 0, 0); transform: translate3d(0, 0, 0); } -.ion-panel-opened > section > header, -.ion-panel-opened > section > main, -.ion-panel-opened > section > footer { +.ion-panel-opened .bar-header, +.ion-panel-opened .content, +.ion-panel-opened .bar-footer { -webkit-transform: translate3d(270px, 0, 0); -moz-transform: translate3d(270px, 0, 0); transform: translate3d(270px, 0, 0); } diff --git a/example/panels.html b/example/panels.html index bc84405965..4837527f0b 100644 --- a/example/panels.html +++ b/example/panels.html @@ -18,7 +18,7 @@

Panels

-
+

diff --git a/example/panels.html.orig b/example/panels.html.orig deleted file mode 100644 index 29e5c76a06..0000000000 --- a/example/panels.html.orig +++ /dev/null @@ -1,57 +0,0 @@ - - - - Panels - - - - - - - - - -<<<<<<< HEAD -
-======= -
- -
- Panel! -
->>>>>>> 6a7b2a94d30be5df37cff8f6f754e9e987f11163 - -
- -

Panels

-
- -
-<<<<<<< HEAD -

-

-======= -

A whole bunch of content

- Panel ->>>>>>> 6a7b2a94d30be5df37cff8f6f754e9e987f11163 -
- -
-

Panels

-
- -
- - -
- This is my default left side panel! -
- -
- This is my other left side panel! -
- - - - - diff --git a/scss/framework/structure/_panel.scss b/scss/framework/structure/_panel.scss index 1110dcaa24..ba1c75f3d7 100644 --- a/scss/framework/structure/_panel.scss +++ b/scss/framework/structure/_panel.scss @@ -12,7 +12,7 @@ width: $panelOpenWidth; } -header, main, footer { +.bar-header, .content, .bar-footer { z-index: 100; left: 0; right: 0; @@ -26,9 +26,9 @@ header, main, footer { transform: translate3d(0, 0, 0); } -.ion-panel-opened > section > header, -.ion-panel-opened > section > main, -.ion-panel-opened > section > footer +.ion-panel-opened .bar-header, +.ion-panel-opened .content, +.ion-panel-opened .bar-footer { -webkit-transform: translate3d($panelOpenWidth, 0,0 ); -moz-transform: translate3d($panelOpenWidth, 0,0 );