diff --git a/src/components/mdToolbar/index.js b/src/components/mdToolbar/index.js new file mode 100644 index 0000000..ca480b9 --- /dev/null +++ b/src/components/mdToolbar/index.js @@ -0,0 +1,8 @@ +import mdToolbar from './mdToolbar.vue'; +import mdToolbarTheme from './mdToolbar.theme'; + +export default function install(Vue) { + Vue.component('md-toolbar', Vue.extend(mdToolbar)); + + window.VueMaterial.styles.push(mdToolbarTheme); +} diff --git a/src/components/mdToolbar/mdToolbar.scss b/src/components/mdToolbar/mdToolbar.scss new file mode 100644 index 0000000..e0f3136 --- /dev/null +++ b/src/components/mdToolbar/mdToolbar.scss @@ -0,0 +1,53 @@ +@import '../../core/variables.scss'; + +.md-toolbar { + min-height: 64px; + padding: 0 8px; + display: flex; + align-items: center; + flex-flow: row wrap; + + &.md-dense { + min-height: 48px; + + &.md-extended { + min-height: 96px; + } + + .md-toolbar-container { + height: 48px; + } + } + + &.md-extended { + min-height: 128px; + + .md-toolbar-container:nth-child(2) { + .md-title:first-child { + margin-left: 72px; + } + } + } + + .md-toolbar-container { + width: 100%; + height: 64px; + display: flex; + align-items: center; + align-self: flex-start; + + > .md-button:first-child { + margin-right: 24px; + } + } + + > .md-button:first-child { + margin-right: 24px; + } + + .md-title { + font-size: 20px; + font-weight: 400; + line-height: 24px; + } +} diff --git a/src/components/mdToolbar/mdToolbar.theme b/src/components/mdToolbar/mdToolbar.theme new file mode 100644 index 0000000..3adce51 --- /dev/null +++ b/src/components/mdToolbar/mdToolbar.theme @@ -0,0 +1,22 @@ +.THEME_NAME { + .md-toolbar, + &.md-toolbar { + background-color: PRIMARY-COLOR; + color: PRIMARY-CONTRAST; + + &.md-accent { + background-color: ACCENT-COLOR; + color: ACCENT-CONTRAST; + } + + &.md-warn { + background-color: WARN-COLOR; + color: WARN-CONTRAST; + } + + &.md-transparent { + background-color: transparent; + color: BACKGROUND-CONTRAST; + } + } +} diff --git a/src/components/mdToolbar/mdToolbar.vue b/src/components/mdToolbar/mdToolbar.vue new file mode 100644 index 0000000..97ca670 --- /dev/null +++ b/src/components/mdToolbar/mdToolbar.vue @@ -0,0 +1,7 @@ + + + diff --git a/src/core/structure.scss b/src/core/structure.scss index e8b7250..b4c2803 100644 --- a/src/core/structure.scss +++ b/src/core/structure.scss @@ -9,6 +9,9 @@ body { -moz-osx-font-smoothing: grayscale; -webkit-font-smoothing: antialiased; color: rgba(#000, .87); - font-size: 14px; font-family: $font-roboto; + font-size: 14px; + font-weight: 400; + letter-spacing: .010em; + line-height: 20px; } diff --git a/src/docs.scss b/src/docs.scss index 77ca09f..48380ed 100644 --- a/src/docs.scss +++ b/src/docs.scss @@ -1,6 +1,4 @@ .docs { - padding: 0 8px; - .cell-phone { width: 360px; height: 480px; diff --git a/src/docs.vue b/src/docs.vue index d14eac0..e5b782d 100644 --- a/src/docs.vue +++ b/src/docs.vue @@ -98,75 +98,75 @@

Button Toggle

- + format_bold - + - + format_italic - + - + strikethrough_s - + - + title - + - - - format_bold - + + + format_align_left + - - format_italic - + + format_align_center + - - strikethrough_s - + + format_align_right + - - title - + + format_align_justify + - + format_bold - + - + format_italic - + - - strikethrough_s - + + format_underline + - + title - + - + format_bold - + - + format_italic - + - + strikethrough_s - + - + title - + @@ -203,6 +203,32 @@ + +
+

Toolbar

+ + +
+ + menu + + + + + + search + + + + filter_list + +
+ +
+

Vue Material

+
+
+
diff --git a/src/main.js b/src/main.js index 7a5b0ef..211a0af 100644 --- a/src/main.js +++ b/src/main.js @@ -1,18 +1,21 @@ import Vue from 'vue'; import Docs from './docs'; import './core/core'; +import MdTheme from './components/mdTheme'; import MdInkRipple from './components/mdInkRipple'; import MdButton from './components/mdButton'; import MdButtonToggle from './components/mdButtonToggle'; import MdIcon from './components/mdIcon'; import MdBottomBar from './components/mdBottomBar'; -import MdTheme from './components/mdTheme'; +import mdToolbar from './components/mdToolbar'; Vue.use(MdInkRipple); Vue.use(MdButton); Vue.use(MdButtonToggle); Vue.use(MdIcon); Vue.use(MdBottomBar); +Vue.use(mdToolbar); + Vue.use(MdTheme, { 'bottom-bar': { primary: 'teal'