diff --git a/ionic/components/app/extensions/material.scss b/ionic/components/app/extensions/material.scss new file mode 100644 index 0000000000..f10d6d9ef7 --- /dev/null +++ b/ionic/components/app/extensions/material.scss @@ -0,0 +1,5 @@ +.mode-md { + ion-app, .ion-app { + font-family: 'RobotoDraft','Roboto',-apple-system,'Helvetica Neue',sans-serif; + } +} diff --git a/ionic/components/app/test/material/index.ts b/ionic/components/app/test/material/index.ts new file mode 100644 index 0000000000..6728b18da2 --- /dev/null +++ b/ionic/components/app/test/material/index.ts @@ -0,0 +1,49 @@ +import {Component, Directive} from 'angular2/angular2'; + +import {App, IonicView, Register} from 'ionic/ionic'; + +@IonicView({ + template: '' + + 'Heading' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + ` + + All Genres + + + Alternative + + + Blues + + + ` + + '' +}) +export class FirstPage { + constructor() { + } +} + +@App({ + template: ``, + routes: [ + { + path: '/first', + component: FirstPage, + root: true + } + ] +}) +class MyApp { + constructor() { + } +} diff --git a/ionic/components/app/typography.scss b/ionic/components/app/typography.scss index 5e2515d61c..2298a45ea8 100644 --- a/ionic/components/app/typography.scss +++ b/ionic/components/app/typography.scss @@ -4,8 +4,8 @@ // All font sizes use rem units -$font-family-sans-serif: "Helvetica Neue", "Roboto", sans-serif !default; -$font-family-light-sans-serif: "HelveticaNeue-Light", "Roboto-Light", sans-serif-light !default; +$font-family-sans-serif: -apple-system, "Helvetica Neue", "Roboto", sans-serif !default; +$font-family-light-sans-serif: -apple-system, "HelveticaNeue-Light", "Roboto-Light", sans-serif-light !default; $font-family-base: $font-family-sans-serif !default; $font-size-root: 62.5% !default; diff --git a/ionic/components/item/extensions/material.scss b/ionic/components/item/extensions/material.scss new file mode 100644 index 0000000000..5047f09f65 --- /dev/null +++ b/ionic/components/item/extensions/material.scss @@ -0,0 +1,19 @@ +$item-material-min-height: 56px; +$item-material-font-size: 16px; +$item-material-label-color: #222; + +.list[mode="md"] { + .item { + padding-left: 16px; + } + .item-content { + min-height: $item-material-min-height; + padding-right: 16px; + border-bottom: 1px solid #DBDBDB; + } + + .item-label { + color: $item-material-label-color; + font-size: $item-material-font-size; + } +} diff --git a/ionic/components/list/extensions/material.scss b/ionic/components/list/extensions/material.scss new file mode 100644 index 0000000000..310b4b4125 --- /dev/null +++ b/ionic/components/list/extensions/material.scss @@ -0,0 +1,2 @@ +.list[mode="md"] { +} diff --git a/ionic/components/nav-bar/extensions/material.scss b/ionic/components/nav-bar/extensions/material.scss index 6d6d3dcc6b..9733c308bf 100644 --- a/ionic/components/nav-bar/extensions/material.scss +++ b/ionic/components/nav-bar/extensions/material.scss @@ -3,19 +3,20 @@ // -------------------------------------------------- $navbar-material-height: 6.4rem !default; -$navbar-material-background: #f7f7f8 !default; +$navbar-material-background: #f7f7f8; //get-color(primary, base) !default;//#f7f7f8 !default; $navbar-material-title-font-size: 2rem !default; $navbar-material-button-font-size: 2rem !default; $navbar-material-button-text-color: #007aff !default; -.navbar[mode="md"] { +.nav[mode="md"] .navbar-container { height: $navbar-material-height; background: $navbar-material-background; - .navbar-title { + ion-title { font-size: $navbar-material-title-font-size; + font-weight: bold; } button, diff --git a/ionic/components/nav-bar/nav-bar.scss b/ionic/components/nav-bar/nav-bar.scss index 32d0c7830c..6475240fd7 100644 --- a/ionic/components/nav-bar/nav-bar.scss +++ b/ionic/components/nav-bar/nav-bar.scss @@ -35,3 +35,22 @@ display: flex; align-items: center; } + +// Core Nav Bar Color Generation +// -------------------------------------------------- + +@each $color, $value in $colors { + + .navbar[#{$color}] { + background-color: get-color($color, base); + + ion-title { + color: white; + } + button, + [button] { + color: white; + } + } + +} diff --git a/ionic/components/nav/test/basic/pages/first-page.ts b/ionic/components/nav/test/basic/pages/first-page.ts index a80e2ef0cb..29efef7853 100644 --- a/ionic/components/nav/test/basic/pages/first-page.ts +++ b/ionic/components/nav/test/basic/pages/first-page.ts @@ -7,7 +7,7 @@ import {ThirdPage} from './third-page'; @IonicView({ template: '' + - '' + + '' + 'First Page: {{ val }}' + '' + '' + diff --git a/ionic/components/nav/test/basic/pages/second-page.ts b/ionic/components/nav/test/basic/pages/second-page.ts index 6a13d39e7b..ea797903fa 100644 --- a/ionic/components/nav/test/basic/pages/second-page.ts +++ b/ionic/components/nav/test/basic/pages/second-page.ts @@ -5,7 +5,7 @@ import {FirstPage} from './first-page'; @IonicView({ template: ` - Second Page Header + Second Page Header

diff --git a/ionic/ionic.scss b/ionic/ionic.scss index 897c3c3deb..1d578c3818 100755 --- a/ionic/ionic.scss +++ b/ionic/ionic.scss @@ -73,8 +73,12 @@ // Material Design Components @import + "components/app/extensions/material", "components/alert/extensions/material", "components/button/extensions/material", + "components/item/extensions/material", + "components/list/extensions/material", + "components/nav-bar/extensions/material", "components/tabs/extensions/material";