diff --git a/src/components/app/structure.scss b/src/components/app/structure.scss index 3805777523..a161e4d844 100644 --- a/src/components/app/structure.scss +++ b/src/components/app/structure.scss @@ -18,7 +18,7 @@ $z-index-navbar-section: 10; $z-index-page-container: 0; $z-index-selected-tab: 1; $z-index-toolbar: 10; -$z-index-toolbar-background: -1; +$z-index-toolbar-background: 0; $z-index-toolbar-border: 20; $z-index-list-border: 50; @@ -183,6 +183,11 @@ ion-header { width: 100%; } +ion-toolbar { + position: relative; + z-index: $z-index-toolbar; +} + ion-footer { position: absolute; bottom: 0; @@ -250,4 +255,4 @@ ion-content.js-scroll > scroll-content { [nav-portal], [tab-portal] { display: none; -} \ No newline at end of file +} diff --git a/src/components/toolbar/test/colors/main.html b/src/components/toolbar/test/colors/main.html index 73fe3069df..73adba1f52 100644 --- a/src/components/toolbar/test/colors/main.html +++ b/src/components/toolbar/test/colors/main.html @@ -1,218 +1,202 @@ - - This is the title that never ends. It just goes on and on my friend. - + + + This is the title that never ends. It just goes on and on my friend. + + + + + + + + + + + Default + - - - - - - - - - - Default - + + + + + + + + + Primary + + + + + + + + + + Primary.activated + - - - - - - - - - Primary - + + + + + + Secondary + + + + + + + + + + Secondary Activated + + + + - - - - - - - - - Primary.activated - + + + + + + + + + Dark + + + + + + + + + + Dark.activated + - - - - - - Secondary - - - - + + + + + + + + Danger + - - - - - - - Secondary Activated - - - - + + + + Danger + + + + + + + + + Light + - - - - + + Light + + + + + + + Transparent + - - - - - Dark - - - - - - - - - - - - Dark.activated - - - - - - - - - - - Danger - - - - - - - - - Danger - - - - - - - - - - Light - - - - - - - - - Light - - - - - - - - Transparent - - - - - + + diff --git a/src/components/toolbar/test/scenarios/main.html b/src/components/toolbar/test/scenarios/main.html index 7fe453ae2c..c1a75dea0c 100644 --- a/src/components/toolbar/test/scenarios/main.html +++ b/src/components/toolbar/test/scenarios/main.html @@ -1,226 +1,214 @@ - - This is the title that never ends. It just goes on and on my friend. - - - - - - - - - - This is a long title with buttons. It just goes on and on my friend. - + + + This is the title that never ends. It just goes on and on my friend. + - - - - - - - - - Defaults - + + + + + + + + + This is a long title with buttons. It just goes on and on my friend. + + + + + + + + + + Defaults + - - - + + + + + + Defaults.activated + + + + + + + + Solid + + + + + + + + + + + + + Solid Activated + + + + + + + + + + + + + + Outline + + + + + + + + + + + Outline.activated + + + + + + + + Edit + + + + Icon/Color Attr + + + + + + + + + Edit + + + Text Only + + + + - + + Left side menu toggle + + + + + + + Right side menu toggle + - - - - - Defaults.activated - + + + + + + + + Something + + + Else + + + - - - - - - Solid - - - - - - - - - - - - - - Solid Activated - - - - - - - - - - - - - - - Outline - - - - - - - - - - - - Outline.activated - - - - - - - - - Edit - - - - Icon/Color Attr - - - - - - - - - Edit - - - Text Only - - - - - - - - - Left side menu toggle - - - - - - - - Right side menu toggle - - - - - - - - - - Something - - - Else - - - - - - - - Light - - - Toolbar - - - Default Segment - - - - - - + + + + Light + + + Toolbar + + + Default Segment + + + + diff --git a/src/components/toolbar/toolbar.scss b/src/components/toolbar/toolbar.scss index 01e9c6fff7..70b0d219b1 100644 --- a/src/components/toolbar/toolbar.scss +++ b/src/components/toolbar/toolbar.scss @@ -1,9 +1,9 @@ @import "../../globals.core"; + // Toolbar // -------------------------------------------------- - .toolbar { display: flex; overflow: hidden; @@ -67,6 +67,7 @@ ion-buttons div { pointer-events: auto; } + // Transparent Toolbar // -------------------------------------------------- @@ -84,6 +85,7 @@ ion-buttons, transform: translateZ(0); } + // Navbar // -------------------------------------------------- diff --git a/src/components/virtual-scroll/test/basic/main.html b/src/components/virtual-scroll/test/basic/main.html index eb8470a7f8..ff29033aae 100644 --- a/src/components/virtual-scroll/test/basic/main.html +++ b/src/components/virtual-scroll/test/basic/main.html @@ -1,5 +1,4 @@ - Virtual Scroll{{webview}} @@ -8,7 +7,6 @@ - diff --git a/src/components/virtual-scroll/test/cards/main.html b/src/components/virtual-scroll/test/cards/main.html index 9ed993421b..074cd52c9b 100644 --- a/src/components/virtual-scroll/test/cards/main.html +++ b/src/components/virtual-scroll/test/cards/main.html @@ -1,4 +1,8 @@ -Virtual Scroll: Cards + + + Virtual Scroll: Cards + + diff --git a/src/components/virtual-scroll/test/image-gallery/main.html b/src/components/virtual-scroll/test/image-gallery/main.html index 7bad8f3b52..47d88110d4 100644 --- a/src/components/virtual-scroll/test/image-gallery/main.html +++ b/src/components/virtual-scroll/test/image-gallery/main.html @@ -1,39 +1,4 @@ - - - - Virtual Scroll: Image Gallery @@ -42,7 +7,6 @@ - @@ -75,3 +39,35 @@ + diff --git a/src/components/virtual-scroll/test/sliding-item/main.html b/src/components/virtual-scroll/test/sliding-item/main.html index c87bb2ce8c..297576de1f 100644 --- a/src/components/virtual-scroll/test/sliding-item/main.html +++ b/src/components/virtual-scroll/test/sliding-item/main.html @@ -1,5 +1,4 @@ - Virtual Scroll{{webview}} @@ -8,7 +7,6 @@ - diff --git a/src/components/virtual-scroll/test/variable-size/main.html b/src/components/virtual-scroll/test/variable-size/main.html index 267eeb590d..9f274005fc 100644 --- a/src/components/virtual-scroll/test/variable-size/main.html +++ b/src/components/virtual-scroll/test/variable-size/main.html @@ -1,4 +1,8 @@ -Virtual Scroll: Variable Sizes + + + Virtual Scroll: Variable Sizes + +