Merge branch 'media' into woothu

Author: woothu

src/components/Media/CMedia.js

@@ -0,0 +1,32 @@
+import { mergeData } from 'vue-functional-data-merge'
+
+export default {
+  functional: true,
+  name: 'CMedia',
+  props: {
+    asideClasses: String,
+    asideRight: Boolean,
+  },
+  render (h, { props, data, slots }) {
+    let childNodes = []
+    const $slots = slots()
+    const asideClasses = props.asideClasses ?
+                         props.asideClasses :
+                         props.asideRight ?
+                         'ml-3 align-self-start' :
+                         'mr-3 align-self-start'
+
+    const aside = h(
+      'div',
+      { class: asideClasses },
+      $slots.aside
+    )
+    const body = h(
+      'div',
+      { staticClass: 'media-body' },
+      $slots.default
+    )
+    props.asideRight ? childNodes.push(body, aside) : childNodes.push(aside, body)
+    return h('div', mergeData(data, { staticClass: 'media' }), childNodes)
+  }
+}

src/components/Media/index.js

@@ -0,0 +1,5 @@
+import CMedia from './CMedia'
+
+export {
+  CMedia
+}

src/components/index.js

@@ -18,10 +18,14 @@ export * from './Dropdown'
 export * from './ListGroup'
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 export * from './Toolip'
 =======
 export * from './Pagination'
 >>>>>>> pagination
 =======
 export * from './Navbar'
 >>>>>>> navbar
+=======
+export * from './Media'
+>>>>>>> media