diff --git a/src/components/action-sheet/test/basic/index.ts b/src/components/action-sheet/test/basic/index.ts index 34da55c8b4..c2caa533a6 100644 --- a/src/components/action-sheet/test/basic/index.ts +++ b/src/components/action-sheet/test/basic/index.ts @@ -154,12 +154,14 @@ class E2EPage { @Component({ template: ` - - - - - Modal - + + + + + + Modal + + Hi, I'm Bob, and I'm a modal. diff --git a/src/components/action-sheet/test/basic/main.html b/src/components/action-sheet/test/basic/main.html index 93915ed9a2..59de1bfa63 100644 --- a/src/components/action-sheet/test/basic/main.html +++ b/src/components/action-sheet/test/basic/main.html @@ -1,9 +1,14 @@ + + + + Action Sheet + + + - - Action Sheet - + @@ -11,4 +16,5 @@ 
     Result: {{result}}
+ diff --git a/src/components/alert/test/basic/index.ts b/src/components/alert/test/basic/index.ts index 23e2050c44..766e3c1881 100644 --- a/src/components/alert/test/basic/index.ts +++ b/src/components/alert/test/basic/index.ts @@ -295,12 +295,14 @@ class E2EPage { @Component({ template: ` - - - - - Modal - + + + + + + Modal + + Hi, I'm Bob, and I'm a modal. diff --git a/src/components/alert/test/basic/main.html b/src/components/alert/test/basic/main.html index 3aa69d47c2..eb58eafab7 100644 --- a/src/components/alert/test/basic/main.html +++ b/src/components/alert/test/basic/main.html @@ -1,6 +1,11 @@ - - Alerts - + + + + Alerts + + + + diff --git a/src/components/alert/test/dismiss/index.ts b/src/components/alert/test/dismiss/index.ts index be0148cae1..a01daa24eb 100644 --- a/src/components/alert/test/dismiss/index.ts +++ b/src/components/alert/test/dismiss/index.ts @@ -24,7 +24,7 @@ export class E2EPage { ] }); - alert.onDismiss((asdf) => { + alert.onDismiss(() => { console.log('dismiss'); this.nav.push(AnotherPage); }); @@ -35,9 +35,11 @@ export class E2EPage { @Component({ template: ` - - Another Page - + + + Another Page + +
diff --git a/src/components/alert/test/dismiss/main.html b/src/components/alert/test/dismiss/main.html index 9cfa06a9e5..d917a544bb 100644 --- a/src/components/alert/test/dismiss/main.html +++ b/src/components/alert/test/dismiss/main.html @@ -1,8 +1,13 @@ - - - Alert Dismiss - - + + + + + Alert Dismiss + + + + + diff --git a/src/components/app/test/animations/main.html b/src/components/app/test/animations/main.html index 92b87cb349..24876901d1 100644 --- a/src/components/app/test/animations/main.html +++ b/src/components/app/test/animations/main.html @@ -1,6 +1,11 @@ - - Animations - + + + + Animations + + + + diff --git a/src/components/app/test/cordova/index.ts b/src/components/app/test/cordova/index.ts index 682c8bf329..b1559e9073 100644 --- a/src/components/app/test/cordova/index.ts +++ b/src/components/app/test/cordova/index.ts @@ -23,17 +23,19 @@ export class OtherData { @Component({ template: ` - - This is a modal - - - - - + + + + +

The modal toolbar should have status bar padding.

@@ -97,17 +99,19 @@ class Page3 { @Component({ template: ` - - This is a tab page - - - - - + + + + +

The toolbar should have status bar padding.

 diff --git a/src/components/app/test/cordova/page1.html b/src/components/app/test/cordova/page1.html index b6f1d1280d..762332f954 100644 --- a/src/components/app/test/cordova/page1.html +++ b/src/components/app/test/cordova/page1.html @@ -1,27 +1,35 @@ - - - All - Favorites - - - - - - - - - I'm a toolbar - + + + + + + + + I'm a toolbar + + + + +
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Morbi scelerisque dolor lacus, ut vehicula arcu dapibus id. Morbi iaculis fermentum blandit. Curabitur tempus, ante et vehicula tempor, urna velit rutrum massa, quis suscipit purus lacus eget est. Sed nisi nulla, tempus id dictum a, cursus ut felis. Aliquam orci magna, rutrum nec tempor ac, fermentum quis eros. Sed ullamcorper felis sit amet tristique sagittis. Nullam sed tempus mi. Morbi sit amet lacinia leo. Nunc facilisis orci id consectetur dignissim. Integer dictum consectetur enim. Vivamus auctor, turpis ut eleifend pharetra, purus magna mattis arcu, vel pharetra tellus orci eget ex. Integer blandit posuere vehicula. Ut ipsum lorem, efficitur vitae eleifend tincidunt, fermentum nec lacus. Ut nec fermentum dui.
+ diff --git a/src/components/app/test/cordova/page2.html b/src/components/app/test/cordova/page2.html index d2a59ad0b8..1aa9f46a50 100644 --- a/src/components/app/test/cordova/page2.html +++ b/src/components/app/test/cordova/page2.html @@ -1,25 +1,33 @@ - - Page 2 - - - - - - - - I'm a toolbar - + + + + + + + + I'm a toolbar + + + + +
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Morbi scelerisque dolor lacus, ut vehicula arcu dapibus id. Morbi iaculis fermentum blandit. Curabitur tempus, ante et vehicula tempor, urna velit rutrum massa, quis suscipit purus lacus eget est. Sed nisi nulla, tempus id dictum a, cursus ut felis. Aliquam orci magna, rutrum nec tempor ac, fermentum quis eros. Sed ullamcorper felis sit amet tristique sagittis. Nullam sed tempus mi. Morbi sit amet lacinia leo. Nunc facilisis orci id consectetur dignissim. Integer dictum consectetur enim. Vivamus auctor, turpis ut eleifend pharetra, purus magna mattis arcu, vel pharetra tellus orci eget ex. Integer blandit posuere vehicula. Ut ipsum lorem, efficitur vitae eleifend tincidunt, fermentum nec lacus. Ut nec fermentum dui.
+ diff --git a/src/components/app/test/cordova/page3.html b/src/components/app/test/cordova/page3.html index 9ab3eda08f..ffbec7b95c 100644 --- a/src/components/app/test/cordova/page3.html +++ b/src/components/app/test/cordova/page3.html @@ -1,10 +1,17 @@ +

Page 3

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Morbi scelerisque dolor lacus, ut vehicula arcu dapibus id. Morbi iaculis fermentum blandit. Curabitur tempus, ante et vehicula tempor, urna velit rutrum massa, quis suscipit purus lacus eget est. Sed nisi nulla, tempus id dictum a, cursus ut felis. Aliquam orci magna, rutrum nec tempor ac, fermentum quis eros. Sed ullamcorper felis sit amet tristique sagittis. Nullam sed tempus mi. Morbi sit amet lacinia leo. Nunc facilisis orci id consectetur dignissim. Integer dictum consectetur enim. Vivamus auctor, turpis ut eleifend pharetra, purus magna mattis arcu, vel pharetra tellus orci eget ex. Integer blandit posuere vehicula. Ut ipsum lorem, efficitur vitae eleifend tincidunt, fermentum nec lacus. Ut nec fermentum dui.
+ - - I'm a bottom toolbar - + + + + + I'm a bottom toolbar + + + diff --git a/src/components/app/test/gestures/main.html b/src/components/app/test/gestures/main.html index c904b1465d..3f934bfbe3 100644 --- a/src/components/app/test/gestures/main.html +++ b/src/components/app/test/gestures/main.html @@ -1,6 +1,11 @@ - - Gestures - + + + + Gestures + + + + diff --git a/src/components/app/test/typography/main.html b/src/components/app/test/typography/main.html index b3f7810821..015e05ce62 100644 --- a/src/components/app/test/typography/main.html +++ b/src/components/app/test/typography/main.html @@ -1,7 +1,11 @@ + + + + Typography + + + - - Typography - diff --git a/src/components/badge/test/basic/main.html b/src/components/badge/test/basic/main.html index 3a2f0cf16a..3a39f838e8 100644 --- a/src/components/badge/test/basic/main.html +++ b/src/components/badge/test/basic/main.html @@ -1,8 +1,14 @@ - - Badges - + + + + Badges + + + + + Badges Right @@ -32,6 +38,7 @@ 99 + Badges Left @@ -61,4 +68,5 @@ 99 + diff --git a/src/components/button/test/block/main.html b/src/components/button/test/block/main.html index cb324289f1..828df55def 100644 --- a/src/components/button/test/block/main.html +++ b/src/components/button/test/block/main.html @@ -1,7 +1,11 @@ + + + + Block Buttons + + + - - Block Buttons - diff --git a/src/components/button/test/clear/main.html b/src/components/button/test/clear/main.html index 257fdc8a6b..c52c3f3389 100644 --- a/src/components/button/test/clear/main.html +++ b/src/components/button/test/clear/main.html @@ -1,7 +1,11 @@ + + + + Clear Buttons + + + - - Clear Buttons - diff --git a/src/components/button/test/dynamic/main.html b/src/components/button/test/dynamic/main.html index 65e6fc8b9f..6faac74937 100644 --- a/src/components/button/test/dynamic/main.html +++ b/src/components/button/test/dynamic/main.html @@ -1,15 +1,20 @@ + + + + + + + Default Buttons + + + + + + - - - - - Default Buttons - - - - + @@ -22,4 +27,5 @@
+ diff --git a/src/components/button/test/full/main.html b/src/components/button/test/full/main.html index 195c7296fb..d135a8aa54 100644 --- a/src/components/button/test/full/main.html +++ b/src/components/button/test/full/main.html @@ -1,6 +1,11 @@ - - Full Buttons - + + + + Full Buttons + + + + @@ -34,4 +39,5 @@ a[button][full][clear][dark]

+ \ No newline at end of file diff --git a/src/components/button/test/icons/main.html b/src/components/button/test/icons/main.html index c6ab489375..081c17c2ed 100644 --- a/src/components/button/test/icons/main.html +++ b/src/components/button/test/icons/main.html @@ -1,7 +1,11 @@ + + + + Buttons Icons + + + - - Buttons Icons - diff --git a/src/components/button/test/raised/main.html b/src/components/button/test/raised/main.html index 51a9b1d7f3..cd85adc1fd 100644 --- a/src/components/button/test/raised/main.html +++ b/src/components/button/test/raised/main.html @@ -1,7 +1,11 @@ + + + + Raised Buttons + + + - - Raised Buttons - @@ -38,4 +42,5 @@

+ diff --git a/src/components/button/test/round/main.html b/src/components/button/test/round/main.html index f90d2f7b70..e18627e16a 100644 --- a/src/components/button/test/round/main.html +++ b/src/components/button/test/round/main.html @@ -1,9 +1,14 @@ + + + + Round Buttons + + + - - Round Buttons - + @@ -18,6 +23,7 @@ + \ No newline at end of file diff --git a/src/components/popover/test/basic/main.html b/src/components/popover/test/basic/main.html index 55361f5858..d031afd448 100644 --- a/src/components/popover/test/basic/main.html +++ b/src/components/popover/test/basic/main.html @@ -1,24 +1,30 @@ - - - - - - Popover - - - - - + + + + + + + + Popover + + + + + + + + + - - - + + + + + Popover + + + + + + + diff --git a/src/components/radio/test/basic/main.html b/src/components/radio/test/basic/main.html index 4c4c9681a7..007d1bc22a 100644 --- a/src/components/radio/test/basic/main.html +++ b/src/components/radio/test/basic/main.html @@ -1,7 +1,11 @@ - - Radio Group - + + + + Radio Group + + + diff --git a/src/components/range/test/basic/page1.html b/src/components/range/test/basic/page1.html index ace0d3ada0..dcc8dec1a0 100644 --- a/src/components/range/test/basic/page1.html +++ b/src/components/range/test/basic/page1.html @@ -1,18 +1,18 @@ - + - + + + + Range + + + - - Range - - - - - + diff --git a/src/components/refresher/test/basic/main.html b/src/components/refresher/test/basic/main.html index 1e8ded6a6d..6b44c4231a 100644 --- a/src/components/refresher/test/basic/main.html +++ b/src/components/refresher/test/basic/main.html @@ -1,4 +1,11 @@ -Pull To Refresh + + + + Pull To Refresh + + + + diff --git a/src/components/scroll/test/basic/main.html b/src/components/scroll/test/basic/main.html index 3637a85aae..1fcccb8b5a 100644 --- a/src/components/scroll/test/basic/main.html +++ b/src/components/scroll/test/basic/main.html @@ -1,26 +1,32 @@ - - Scroll + - + + Scroll + -

Horizontal

- -
- + -

Vertical

- -
- -

Both

- -
- + + +

Horizontal

+ +
+ + +

Vertical

+ +
+ + +

Both

+ +
+ + + - - + + Virtual Scroll: Image Gallery @@ -40,8 +42,10 @@ + + + Virtual Scroll{{webview}} @@ -7,10 +8,11 @@ + - + @@ -31,5 +33,4 @@ - diff --git a/tooling/generators/page/page.tmpl.html b/tooling/generators/page/page.tmpl.html index 6d2097f41a..58a9985901 100644 --- a/tooling/generators/page/page.tmpl.html +++ b/tooling/generators/page/page.tmpl.html @@ -5,11 +5,14 @@ Ionic pages and navigation. --> + <%= name %> + +