diff --git a/demos/component-docs/app.html b/demos/component-docs/app.html index a7d04303cc..44c8977809 100644 --- a/demos/component-docs/app.html +++ b/demos/component-docs/app.html @@ -1,4 +1,6 @@ + + diff --git a/demos/component-docs/app.scss b/demos/component-docs/app.scss index 5f219ab970..14193d4f58 100644 --- a/demos/component-docs/app.scss +++ b/demos/component-docs/app.scss @@ -127,6 +127,14 @@ body.md img#md-only { height: auto; } +body.md img#md-tabs-icon, body.md img#md-tabs-icon-text { + display: none; + position: absolute; + top: -24px; + width: 100%; + height: auto; +} + body.ios img#ios-only { display: block !important; position: absolute; diff --git a/demos/component-docs/helpers.ts b/demos/component-docs/helpers.ts index 10e380cc49..0747793e97 100644 --- a/demos/component-docs/helpers.ts +++ b/demos/component-docs/helpers.ts @@ -18,10 +18,7 @@ import * as tabs from './tabs/tabs'; @Directive({ - selector: '[android-attr]', - defaultInputs: { - 'androidAttr': 'primary' - }, + selector: '.android-attr', }) export class AndroidAttribute { @@ -72,6 +69,7 @@ export function hasScrollbar() { export function getPageFor(hash) { return { + 'overview': actionSheets.BasicPage, 'action-sheets': actionSheets.BasicPage, 'buttons': buttons.BasicPage, diff --git a/demos/component-docs/img/android-statusbar-purple.png b/demos/component-docs/img/android-statusbar-purple.png new file mode 100644 index 0000000000..f737f45dd2 Binary files /dev/null and b/demos/component-docs/img/android-statusbar-purple.png differ diff --git a/demos/component-docs/img/android-statusbar-red.png b/demos/component-docs/img/android-statusbar-red.png new file mode 100644 index 0000000000..d43e078975 Binary files /dev/null and b/demos/component-docs/img/android-statusbar-red.png differ diff --git a/demos/component-docs/tabs/icon-text/pages.ts b/demos/component-docs/tabs/icon-text/pages.ts index 4236aa8949..3532f199a7 100644 --- a/demos/component-docs/tabs/icon-text/pages.ts +++ b/demos/component-docs/tabs/icon-text/pages.ts @@ -18,6 +18,14 @@ class TabIconTextPage { this.platform = platform; this.isAndroid = platform.is('android'); } + onInit() { + document.getElementById('md-tabs-icon-text').style.display = "block"; + document.getElementById('md-only').style.display = "none"; + } + onDestroy() { + document.getElementById('md-tabs-icon-text').style.display = "none"; + document.getElementById('md-only').style.display = "block"; + } } @Page({ diff --git a/demos/component-docs/tabs/icon/pages.ts b/demos/component-docs/tabs/icon/pages.ts index 2fedf5d732..0ee58fe0d3 100644 --- a/demos/component-docs/tabs/icon/pages.ts +++ b/demos/component-docs/tabs/icon/pages.ts @@ -7,7 +7,7 @@ import * as helpers from '../../helpers'; @Page({ template: '' + '' + - 'Tabs' + + 'Tabs' + '' + '' + '', @@ -18,15 +18,23 @@ class TabIconPage { this.platform = platform; this.isAndroid = platform.is('android'); } + onInit() { + document.getElementById('md-tabs-icon').style.display = "block"; + document.getElementById('md-only').style.display = "none"; + } + onDestroy() { + document.getElementById('md-tabs-icon').style.display = "none"; + document.getElementById('md-only').style.display = "block"; + } } @Page({ template: '' + - '' + - '' + - '' + - '' + + '' + + '' + + '' + + '' + '', }) export class IconPage {