Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 881ca13

Browse filesBrowse files
authored
Merge pull request #5 from coreui/dev-v2-beta-1
HeaderDropdown refactor
2 parents 5c61f3b + df8c3f6 commit 881ca13
Copy full SHA for 881ca13

File tree

Expand file treeCollapse file tree

4 files changed

+13
-25
lines changed
Filter options
Expand file treeCollapse file tree

4 files changed

+13
-25
lines changed

‎README.md

Copy file name to clipboardExpand all lines: README.md
+3-1Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
# @coreui/vue
22

3+
[![Npm badge](https://img.shields.io/npm/v/@coreui/vue.svg)][npm]
34
![Rollup badge](https://img.shields.io/badge/Rollup-^0.53.3-ff69b4.svg)
45
![Jest](https://img.shields.io/badge/Jest-^22.0.4-blue.svg)
56
![Vue](https://img.shields.io/badge/Vue-^2.5.13-brightgreen.svg)
6-
![Npm badge](https://img.shields.io/npm/v/@coreui/vue.svg)
7+
8+
[npm]: https://www.npmjs.com/package/@coreui/vue
79

810
> A [@coreui/vue](https://coreui.io/vue) `v2` library project
911

‎package.json

Copy file name to clipboardExpand all lines: package.json
+4-4Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@coreui/vue",
33
"description": "CoreUI Vue Bootstrap 4 layout components",
4-
"version": "2.0.0-beta.0",
4+
"version": "2.0.0-beta.1",
55
"license": "MIT",
66
"main": "dist/coreui-vue.common.js",
77
"module": "dist/coreui-vue.esm.js",
@@ -82,10 +82,10 @@
8282
"jest-serializer-html": "^5.0.0",
8383
"jest-serializer-vue": "^1.0.0",
8484
"jest-vue-preprocessor": "^1.4.0",
85-
"lint-staged": "^7.1.2",
85+
"lint-staged": "^7.1.3",
8686
"lodash": "^4.17.10",
8787
"node-sass": "^4.9.0",
88-
"prettier": "^1.12.1",
88+
"prettier": "^1.13.4",
8989
"rollup": "^0.59.4",
9090
"rollup-plugin-babel": "^3.0.4",
9191
"rollup-plugin-commonjs": "^9.1.3",
@@ -96,7 +96,7 @@
9696
"rollup-plugin-replace": "^2.0.0",
9797
"rollup-plugin-uglify": "^3.0.0",
9898
"rollup-plugin-vue": "^4.2.0",
99-
"sass-loader": "^7.0.1",
99+
"sass-loader": "^7.0.2",
100100
"uglify-es": "^3.3.9",
101101
"vue": "^2.5.16",
102102
"vue-jest": "^2.6.0",

‎src/components/Aside/Aside.vue

Copy file name to clipboardExpand all lines: src/components/Aside/Aside.vue
-10Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@
55
</template>
66

77
<script>
8-
// import { asideMenuCssClasses, validBreakpoints, checkBreakpoint } from '../../shared/classes'
9-
108
export default {
119
name: 'AppAside',
1210
props: {
@@ -26,7 +24,6 @@ export default {
2624
mounted: function () {
2725
this.isFixed(this.fixed)
2826
this.isOffCanvas(this.offCanvas)
29-
// this.displayBreakpoint(this.display)
3027
},
3128
methods: {
3229
isFixed (fixed) {
@@ -36,13 +33,6 @@ export default {
3633
isOffCanvas (offCanvas) {
3734
offCanvas ? document.body.classList.add('aside-menu-off-canvas') : document.body.classList.remove('aside-menu-off-canvas')
3835
}
39-
// displayBreakpoint (display) {
40-
// let cssClass = asideMenuCssClasses[0]
41-
// if (display && checkBreakpoint(display, validBreakpoints)) {
42-
// cssClass = `aside-menu-${display}-show`
43-
// }
44-
// document.body.classList.add(cssClass)
45-
// }
4636
}
4737
}
4838
</script>
+6-10Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
11
<template>
22
<b-nav-item-dropdown :right="right" :no-caret="noCaret">
33
<template slot="button-content">
4-
<slot name="button-content">
5-
<img
6-
src="static/img/avatars/6.jpg"
7-
class="img-avatar"
8-
alt="admin@bootstrapmaster.com" />
4+
<slot name="header">
5+
&#10068;
96
</slot>
107
</template>
11-
<slot>
12-
<div :style="{ right: 'auto', height: '400px' }">dropdown</div>
8+
<slot name="dropdown">
9+
<div :style="{ right: 'auto', height: '200px' }">
10+
<span class="text-center">dropdown</span>
11+
</div>
1312
</slot>
1413
</b-nav-item-dropdown>
1514
</template>
@@ -25,9 +24,6 @@ export default {
2524
type: Boolean,
2625
default: false
2726
}
28-
},
29-
data: () => {
30-
return { itemsCount: 42 }
3127
}
3228
}
3329
</script>

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.