diff --git a/package.json b/package.json index 8a0d1531..8e560c5c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@coreui/coreui-free-vue-admin-template", - "version": "2.0.1", + "version": "3.0.0-alpha", "description": "Open Source Bootstrap Admin Template", "author": "Ɓukasz Holeczek", "homepage": "http://coreui.io", @@ -17,7 +17,7 @@ "@coreui/coreui": "^2.1.6", "@coreui/coreui-plugin-chartjs-custom-tooltips": "^1.2.0", "@coreui/icons": "0.3.0", - "@coreui/vue": "github:coreui/coreui-vue#test", + "@coreui/vue": "github:coreui/coreui-vue#v3-bridge-alpha", "bootstrap": "^4.1.3", "bootstrap-vue": "^2.0.0-rc.11", "chart.js": "^2.7.3", @@ -29,7 +29,7 @@ "perfect-scrollbar": "^1.4.0", "simple-line-icons": "^2.4.1", "tooltip.js": "^1.3.1", - "vue": "^2.5.17", + "vue": "^2.6.6", "vue-chartjs": "^3.4.0", "vue-perfect-scrollbar": "^0.1.0", "vue-router": "^3.0.1" @@ -47,7 +47,7 @@ "https-proxy-agent": "^2.2.1", "node-sass": "^4.9.4", "sass-loader": "^7.1.0", - "vue-template-compiler": "^2.5.17" + "vue-template-compiler": "^2.6.6" }, "browserslist": [ "> 1%", diff --git a/src/containers/DefaultAside.vue b/src/containers/DefaultAside.vue index b60ead63..6c93c8ba 100644 --- a/src/containers/DefaultAside.vue +++ b/src/containers/DefaultAside.vue @@ -1,14 +1,14 @@ diff --git a/src/containers/DefaultContainer.vue b/src/containers/DefaultContainer.vue index b01d8f80..c65a18eb 100644 --- a/src/containers/DefaultContainer.vue +++ b/src/containers/DefaultContainer.vue @@ -1,53 +1,53 @@ diff --git a/src/views/base/Breadcrumbs.vue b/src/views/base/Breadcrumbs.vue index f4df774e..964c8a87 100644 --- a/src/views/base/Breadcrumbs.vue +++ b/src/views/base/Breadcrumbs.vue @@ -1,42 +1,34 @@ diff --git a/src/views/base/Collapses.vue b/src/views/base/Collapses.vue index 277d2959..7de09f2d 100644 --- a/src/views/base/Collapses.vue +++ b/src/views/base/Collapses.vue @@ -1,176 +1,163 @@ diff --git a/src/views/base/Forms.vue b/src/views/base/Forms.vue index 95d44bbc..97ccf009 100644 --- a/src/views/base/Forms.vue +++ b/src/views/base/Forms.vue @@ -1,1035 +1,763 @@ diff --git a/src/views/base/Navs.vue b/src/views/base/Navs.vue index 37270549..db6715a7 100644 --- a/src/views/base/Navs.vue +++ b/src/views/base/Navs.vue @@ -1,164 +1,153 @@ diff --git a/src/views/base/Paginations.vue b/src/views/base/Paginations.vue index 12308c02..c72eefa3 100644 --- a/src/views/base/Paginations.vue +++ b/src/views/base/Paginations.vue @@ -1,121 +1,70 @@ diff --git a/src/views/base/Popovers.vue b/src/views/base/Popovers.vue index 17db010e..9ed1ef58 100644 --- a/src/views/base/Popovers.vue +++ b/src/views/base/Popovers.vue @@ -1,178 +1,178 @@ @@ -183,12 +183,13 @@ export default { data () { return { placements: [ - 'topright', 'top', 'topleft', - 'bottomright', 'bottom', 'bottomleft', - 'righttop', 'right', 'lefttop', - 'rightbottom', 'left', 'leftbottom' + 'top-start', 'top', 'top-end', + 'bottom-start', 'bottom', 'bottom-end', + 'right-start', 'right', 'right-end', + 'left-start', 'left', 'left-end' ], - show: false + show: false, + counter: 0 } }, methods: { diff --git a/src/views/base/ProgressBars.vue b/src/views/base/ProgressBars.vue index f5ad395c..72330647 100644 --- a/src/views/base/ProgressBars.vue +++ b/src/views/base/ProgressBars.vue @@ -1,155 +1,139 @@ diff --git a/src/views/base/Switches.vue b/src/views/base/Switches.vue index 9aca6c68..a16d6aa4 100644 --- a/src/views/base/Switches.vue +++ b/src/views/base/Switches.vue @@ -5,16 +5,16 @@

myFlag2: {{myFlag2}}

--> - - - -
+ + + +
Radio switches - {{radio}} - NEW + {{radio}} + NEW
-
+ -
-
-
- - - -
+ + + + + + + Switch default - {{checker}} -
+ {{checker}} + -
-
- - -
+ + + + + Switch pills -
- - - - - - - - - -
-
- - -
+ + + + + + + + + + + + + + + 3d Switch -
- - - - - - - - - -
-
- - -
+ + + + + + + + + + + + + + + 3d Switch disabled -
- - - - - - - - - -
-
- - -
+ + + + + + + + + + + + + + + 3d Switch outline="alt" -
- - - - - - - - - -
-
- - -
+ + + + + + + + + + + + + + + 3d Switch label -
- - - - - - - - - -
-
- - -
+ + + + + + + + + + + + + + + 3d Switch outline="alt" -
- - - - - - - - - -
-
- - -
+ + + + + + + + + + + + + + + 3d Switch outline="alt" -
- - - - - - - - - -
-
- - -
+ + + + + + + + + + + + + + + Switch outline -
- - - - - - - - - -
-
- - -
+ + + + + + + + + + + + + + + Switch outline shape="pill" -
- - - - - - - - - -
-
- - -
+ + + + + + + + + + + + + + + Switch outline="alt" -
- - - - - - - - - -
-
- - -
+ + + + + + + + + + + + + + + Switch outline="alt" shape="pill" -
- - - - - - - - - -
-
- - -
+ + + + + + + + + + + + + + + Switch label -
- - - - - - - - - -
-
- - -
+ + + + + + + + + + + + + + + Switch label shape="pill" -
- - - - - - - - - -
-
- - -
+ + + + + + + + + + + + + + + Switch label outline -
- - - - - - - - - -
-
- - -
+ + + + + + + + + + + + + + + Switch label outline -
- - - - - - - - - -
-
- - -
+ + + + + + + + + + + + + + + Switch label outline -
- - - - - - - - - -
-
- - -
+ + + + + + + + + + + + + + + Switch label outline -
- - - - - - - - - -
-
+ + + + + + + + + + + + - - -
+ + + Switch label -
- - - - - - - - - -
shape -
- - -
+ + + + + + + + + + + shape + + + + Switch label shape="pill" -
- - - - - - - - - -
-
- - -
+ + + + + + + + + + + + + + + Switch label outline -
- - - - - - - - - -
-
- - -
+ + + + + + + + + + + + + + + Switch label outline -
- - - - - - - - - -
-
- - -
+ + + + + + + + + + + + + + + Switch label outline -
- - - - - - - - - -
-
- - -
+ + + + + + + + + + + + + + + Switch label outline -
- - - - - - - - - -
-
+ + + + + + + + + + + + - - -
+ + + Sizes -
- - -