diff --git a/index.html b/index.html index ebec46e..f0823fe 100644 --- a/index.html +++ b/index.html @@ -37,6 +37,7 @@ Button Button Toggle Icon + Divider Ripple List Sidenav diff --git a/src/components/mdDivider/index.js b/src/components/mdDivider/index.js new file mode 100644 index 0000000..07861b7 --- /dev/null +++ b/src/components/mdDivider/index.js @@ -0,0 +1,5 @@ +import mdDivider from './mdDivider.vue'; + +export default function install(Vue) { + Vue.component('md-divider', Vue.extend(mdDivider)); +} diff --git a/src/components/mdDivider/mdDivider.scss b/src/components/mdDivider/mdDivider.scss new file mode 100644 index 0000000..1ee19e9 --- /dev/null +++ b/src/components/mdDivider/mdDivider.scss @@ -0,0 +1,14 @@ +@import '../../core/variables.scss'; + +.md-divider { + height: 1px; + margin: 0; + padding: 0; + display: block; + border: 0; + background-color: rgba(#000, .12); + + &.md-inset { + margin-left: 72px; + } +} diff --git a/src/components/mdDivider/mdDivider.vue b/src/components/mdDivider/mdDivider.vue new file mode 100644 index 0000000..25bb73c --- /dev/null +++ b/src/components/mdDivider/mdDivider.vue @@ -0,0 +1,5 @@ + + + diff --git a/src/components/mdList/mdList.scss b/src/components/mdList/mdList.scss index 5660f5e..11a9d84 100644 --- a/src/components/mdList/mdList.scss +++ b/src/components/mdList/mdList.scss @@ -19,7 +19,6 @@ } .md-list-item-container { - padding: 2px 16px; font-size: 13px; .md-avatar:first-child { @@ -101,6 +100,10 @@ min-height: 88px; } + .md-avatar { + margin: 0; + } + .md-list-item-container { align-items: flex-start; } @@ -123,7 +126,7 @@ width: 100%; min-height: 0; margin: 0; - padding: 6px 16px; + padding: 0 16px; display: flex; position: relative; flex: 1 1 auto; @@ -156,6 +159,13 @@ } } + .md-divider { + position: absolute; + bottom: 0; + right: 0; + left: 0; + } + .md-icon, .md-avatar { margin: 0; @@ -165,6 +175,11 @@ } } + .md-avatar { + margin-top: 8px; + margin-bottom: 8px; + } + .md-icon { color: rgba(#000, .54); } diff --git a/src/components/mdList/mdList.theme b/src/components/mdList/mdList.theme index fcb9c39..8c9c9db 100644 --- a/src/components/mdList/mdList.theme +++ b/src/components/mdList/mdList.theme @@ -1,7 +1,7 @@ .THEME_NAME { .md-list, &.md-list { - background-color: BACKGROUND-COLOR-50; + background-color: BACKGROUND-COLOR-A100; color: BACKGROUND-CONTRAST; } } diff --git a/src/docs/pages/Divider.vue b/src/docs/pages/Divider.vue new file mode 100644 index 0000000..1744479 --- /dev/null +++ b/src/docs/pages/Divider.vue @@ -0,0 +1,17 @@ + + + diff --git a/src/docs/pages/Home.vue b/src/docs/pages/Home.vue index ef10dda..3651a4d 100644 --- a/src/docs/pages/Home.vue +++ b/src/docs/pages/Home.vue @@ -1,5 +1,31 @@ + + diff --git a/src/docs/pages/List.vue b/src/docs/pages/List.vue index 9cc342f..d3b4307 100644 --- a/src/docs/pages/List.vue +++ b/src/docs/pages/List.vue @@ -23,6 +23,8 @@ error Spam + + @@ -83,6 +85,8 @@ error Spam + + @@ -149,6 +153,8 @@ (650) 555-1234 Mobile + + @@ -197,6 +203,8 @@ (650) 555-1234 Mobile + + @@ -243,6 +251,8 @@ star + + @@ -259,6 +269,8 @@ star_border + + @@ -275,6 +287,8 @@ star_border + + @@ -291,6 +305,8 @@ star_border + + @@ -315,6 +331,8 @@ star + + @@ -331,6 +349,8 @@ star_border + + @@ -347,6 +367,8 @@ star_border + + @@ -363,6 +385,8 @@ star_border + + diff --git a/src/docs/routes.js b/src/docs/routes.js index 15330a7..2abc8c9 100644 --- a/src/docs/routes.js +++ b/src/docs/routes.js @@ -8,6 +8,7 @@ import Avatar from './pages/Avatar'; import BottomBar from './pages/BottomBar'; import Buttons from './pages/Buttons'; import ButtonToggle from './pages/ButtonToggle'; +import Divider from './pages/Divider'; import Icon from './pages/Icon'; import Ripple from './pages/Ripple'; import List from './pages/List'; @@ -48,6 +49,10 @@ router.map({ name: 'icon', component: Icon }, + '/divider': { + name: 'divider', + component: Divider + }, '/ripple': { name: 'ripple', component: Ripple diff --git a/src/vue-material.js b/src/vue-material.js index 23feea1..1357a11 100644 --- a/src/vue-material.js +++ b/src/vue-material.js @@ -3,6 +3,7 @@ import MdTheme from './components/mdTheme'; import MdInkRipple from './components/mdInkRipple'; import MdButton from './components/mdButton'; import MdButtonToggle from './components/mdButtonToggle'; +import MdDivider from './components/mdDivider'; import MdIcon from './components/mdIcon'; import MdBottomBar from './components/mdBottomBar'; import MdToolbar from './components/mdToolbar'; @@ -16,6 +17,7 @@ let options = { MdBottomBar, MdButton, MdButtonToggle, + MdDivider, MdIcon, MdInkRipple, MdList,