diff --git a/scripts/e2e/e2e.shared.css b/scripts/e2e/e2e.shared.css index c15fa7a413..e7c03050f3 100644 --- a/scripts/e2e/e2e.shared.css +++ b/scripts/e2e/e2e.shared.css @@ -259,3 +259,7 @@ e2e-popover-basic .text-seravek { e2e-popover-basic .text-times-new-roman { font-family: "Times New Roman"; } + +.rainbow-content { + background: linear-gradient(to right, red, orange, yellow, green, blue, indigo, violet); +} diff --git a/src/components/tabs/test/basic/app-module.ts b/src/components/tabs/test/basic/app-module.ts index 5721655c53..18c52d929e 100644 --- a/src/components/tabs/test/basic/app-module.ts +++ b/src/components/tabs/test/basic/app-module.ts @@ -70,7 +70,7 @@ export class MyModal { template: ` - Heart + Settings diff --git a/src/components/toolbar/test/basic/app-module.ts b/src/components/toolbar/test/basic/app-module.ts new file mode 100644 index 0000000000..f6eebffd1f --- /dev/null +++ b/src/components/toolbar/test/basic/app-module.ts @@ -0,0 +1,34 @@ +import { Component, NgModule } from '@angular/core'; +import { IonicApp, IonicModule } from '../../../..'; + + +@Component({ + templateUrl: 'main.html' +}) +export class E2EPage { + +} + + +@Component({ + template: '' +}) +export class E2EApp { + rootPage = E2EPage; +} + +@NgModule({ + declarations: [ + E2EApp, + E2EPage + ], + imports: [ + IonicModule.forRoot(E2EApp) + ], + bootstrap: [IonicApp], + entryComponents: [ + E2EApp, + E2EPage + ] +}) +export class AppModule { } diff --git a/src/components/toolbar/test/basic/e2e.ts b/src/components/toolbar/test/basic/e2e.ts new file mode 100644 index 0000000000..8b13789179 --- /dev/null +++ b/src/components/toolbar/test/basic/e2e.ts @@ -0,0 +1 @@ + diff --git a/src/components/toolbar/test/basic/main.html b/src/components/toolbar/test/basic/main.html new file mode 100644 index 0000000000..dd4fed610f --- /dev/null +++ b/src/components/toolbar/test/basic/main.html @@ -0,0 +1,106 @@ + + + Toolbar + + + + + + + + + + + + + + + + + Subheader + + + + + + + Card Header + + + + Title + + Some normal text in content. + h3 in content + + Paragraph in content. + + + Another paragraph in content. + + + + + + + Card Header + + + + Title + + Some normal text in content. + h3 in content + + Paragraph in content. + + + Another paragraph in content. + + + + + + + Card Header + + + + Title + + Some normal text in content. + h3 in content + + Paragraph in content. + + + Another paragraph in content. + + + + + + + {{ item }} + + + + + + + + + + + + + + + + + + + Footer + + + diff --git a/src/components/toolbar/toolbar.ios.scss b/src/components/toolbar/toolbar.ios.scss index 2fe25609a9..0bf249550a 100644 --- a/src/components/toolbar/toolbar.ios.scss +++ b/src/components/toolbar/toolbar.ios.scss @@ -39,30 +39,33 @@ $navbar-ios-height: $toolbar-ios-height !default; // -------------------------------------------------- .toolbar-background-ios { - border-top-width: $hairlines-width; - border-bottom-width: $hairlines-width; - border-style: solid; - border-color: $toolbar-ios-border-color; background: $toolbar-ios-background; } -// iOS Toolbar Borders + +// iOS Header / Footer Borders // -------------------------------------------------- -ion-header .toolbar-ios:first-child .toolbar-background, -ion-menu > .toolbar-ios:first-child .toolbar-background, -.toolbar-ios[no-border-top] .toolbar-background { +.header-ios, +.footer-ios { + border-style: solid; + border-color: $toolbar-ios-border-color; +} + +.header-ios { + border-width: 0 0 $hairlines-width; +} + +.footer-ios { + border-width: $hairlines-width 0 0; +} + +.header-ios[no-border] { border-top-width: 0; } -ion-footer .toolbar-ios:last-child .toolbar-background, -.toolbar-ios[no-border-bottom] .toolbar-background { - border-bottom-width: 0; -} - -.toolbar-ios[no-border] .toolbar-background { +.footer-ios[no-border] { border-top-width: 0; - border-bottom-width: 0; } @@ -81,6 +84,7 @@ ion-footer .toolbar-ios:last-child .toolbar-background, font-weight: $toolbar-ios-title-font-weight; text-align: $toolbar-ios-title-text-align; color: $toolbar-ios-title-text-color; + margin-top: 1px; pointer-events: auto; } @@ -104,7 +108,6 @@ ion-footer .toolbar-ios:last-child .toolbar-background, .toolbar-ios-#{$color-name} { .toolbar-background-ios { - border-color: darken($color-base, 10%); background: $color-base; } diff --git a/src/themes/ionic.theme.dark.ios.scss b/src/themes/ionic.theme.dark.ios.scss index 3389ae7e3b..dbd93ea22a 100644 --- a/src/themes/ionic.theme.dark.ios.scss +++ b/src/themes/ionic.theme.dark.ios.scss @@ -34,7 +34,7 @@ $item-ios-note-color: #f4f4f4 !default; // -------------------------------------------------- $toolbar-ios-background: $toolbar-background !default; -$toolbar-ios-border-color: $toolbar-border-color !default; +$toolbar-ios-border-color: rgba(255, 255, 255, 0.1) !default; $toolbar-ios-text-color: $toolbar-text-color !default; $toolbar-ios-active-color: $toolbar-active-color !default; $toolbar-ios-inactive-color: $toolbar-inactive-color !default; diff --git a/src/themes/ionic.theme.default.ios.scss b/src/themes/ionic.theme.default.ios.scss index aaf88b9d8b..14377b73bf 100644 --- a/src/themes/ionic.theme.default.ios.scss +++ b/src/themes/ionic.theme.default.ios.scss @@ -22,7 +22,7 @@ $content-ios-margin: $content-margin !default; $toolbar-ios-height: 44px !default; $toolbar-ios-background: $toolbar-background !default; -$toolbar-ios-border-color: $toolbar-border-color !default; +$toolbar-ios-border-color: rgba(0, 0, 0, .3) !default; $toolbar-ios-text-color: $toolbar-text-color !default; $toolbar-ios-active-color: $toolbar-active-color !default; $toolbar-ios-inactive-color: $toolbar-inactive-color !default;
+ Paragraph in content. +
+ Another paragraph in content. +