Skip to content

Commit

Permalink
Merge pull request #5 from coreui/dev-v2-beta-1
Browse files Browse the repository at this point in the history
HeaderDropdown refactor
  • Loading branch information
xidedix authored Jun 4, 2018
2 parents a2e8d6b + 005a242 commit f6d8868
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 25 deletions.
4 changes: 3 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
# @coreui/vue

[![Npm badge](https://img.shields.io/npm/v/@coreui/vue.svg)][npm]
![Rollup badge](https://img.shields.io/badge/Rollup-^0.53.3-ff69b4.svg)
![Jest](https://img.shields.io/badge/Jest-^22.0.4-blue.svg)
![Vue](https://img.shields.io/badge/Vue-^2.5.13-brightgreen.svg)
![Npm badge](https://img.shields.io/npm/v/@coreui/vue.svg)

[npm]: https://www.npmjs.com/package/@coreui/vue

> A [@coreui/vue](https://coreui.io/vue) `v2` library project
Expand Down
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@coreui/vue",
"description": "CoreUI Vue Bootstrap 4 layout components",
"version": "2.0.0-beta.0",
"version": "2.0.0-beta.1",
"license": "MIT",
"main": "dist/coreui-vue.common.js",
"module": "dist/coreui-vue.esm.js",
Expand Down Expand Up @@ -82,10 +82,10 @@
"jest-serializer-html": "^5.0.0",
"jest-serializer-vue": "^1.0.0",
"jest-vue-preprocessor": "^1.4.0",
"lint-staged": "^7.1.2",
"lint-staged": "^7.1.3",
"lodash": "^4.17.10",
"node-sass": "^4.9.0",
"prettier": "^1.12.1",
"prettier": "^1.13.4",
"rollup": "^0.59.4",
"rollup-plugin-babel": "^3.0.4",
"rollup-plugin-commonjs": "^9.1.3",
Expand All @@ -96,7 +96,7 @@
"rollup-plugin-replace": "^2.0.0",
"rollup-plugin-uglify": "^3.0.0",
"rollup-plugin-vue": "^4.2.0",
"sass-loader": "^7.0.1",
"sass-loader": "^7.0.2",
"uglify-es": "^3.3.9",
"vue": "^2.5.16",
"vue-jest": "^2.6.0",
Expand Down
10 changes: 0 additions & 10 deletions src/components/Aside/Aside.vue
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@
</template>

<script>
// import { asideMenuCssClasses, validBreakpoints, checkBreakpoint } from '../../shared/classes'
export default {
name: 'AppAside',
props: {
Expand All @@ -26,7 +24,6 @@ export default {
mounted: function () {
this.isFixed(this.fixed)
this.isOffCanvas(this.offCanvas)
// this.displayBreakpoint(this.display)
},
methods: {
isFixed (fixed) {
Expand All @@ -36,13 +33,6 @@ export default {
isOffCanvas (offCanvas) {
offCanvas ? document.body.classList.add('aside-menu-off-canvas') : document.body.classList.remove('aside-menu-off-canvas')
}
// displayBreakpoint (display) {
// let cssClass = asideMenuCssClasses[0]
// if (display && checkBreakpoint(display, validBreakpoints)) {
// cssClass = `aside-menu-${display}-show`
// }
// document.body.classList.add(cssClass)
// }
}
}
</script>
16 changes: 6 additions & 10 deletions src/components/Header/HeaderDropdown.vue
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
<template>
<b-nav-item-dropdown :right="right" :no-caret="noCaret">
<template slot="button-content">
<slot name="button-content">
<img
src="static/img/avatars/6.jpg"
class="img-avatar"
alt="[email protected]" />
<slot name="header">
&#10068;
</slot>
</template>
<slot>
<div :style="{ right: 'auto', height: '400px' }">dropdown</div>
<slot name="dropdown">
<div :style="{ right: 'auto', height: '200px' }">
<span class="text-center">dropdown</span>
</div>
</slot>
</b-nav-item-dropdown>
</template>
Expand All @@ -25,9 +24,6 @@ export default {
type: Boolean,
default: false
}
},
data: () => {
return { itemsCount: 42 }
}
}
</script>

0 comments on commit f6d8868

Please sign in to comment.