Skip to content

chore(release): v2.0.0-beta.3 #93

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jun 5, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
## [vue](./README.md) version `changelog`

##### `v2.0.0-beta.3`
- refactor: `getStyles()` back to `@coreui/coreui` version `^2.0.2`
- fix(Dashboard): `width` card-line*-chart-example `ie` issue

##### `v2.0.0-beta.2`
- refactor: `HeaderDropdown` with new slots `header` and `dropdown` *breaking change*
- chore: update `@coreui/vue` to `2.0.0-beta.1`
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@coreui/coreui-free-vue-admin-template",
"version": "2.0.0-beta.2",
"version": "2.0.0-beta.3",
"description": "Open Source Bootstrap Admin Template",
"author": "Łukasz Holeczek",
"homepage": "http://coreui.io",
Expand All @@ -17,7 +17,7 @@
"build": "node build/build.js"
},
"dependencies": {
"@coreui/coreui": "^2.0.1",
"@coreui/coreui": "^2.0.2",
"@coreui/coreui-plugin-chartjs-custom-tooltips": "^1.2.0",
"@coreui/icons": "^0.2.0",
"@coreui/vue": "^2.0.0-beta.1",
Expand Down
10 changes: 0 additions & 10 deletions src/utils/getStyle.js

This file was deleted.

11 changes: 9 additions & 2 deletions src/views/Dashboard.vue
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<h4 class="mb-0">9.823</h4>
<p>Members online</p>
</b-card-body>
<card-line1-chart-example chartId="card-chart-01" class="chart-wrapper px-3" style="height:70px;" height="70"/>
<card-line1-chart-example chartId="card-chart-01" class="chart-wrapper px-3" style="height:70px;" :height="70"/>
</b-card>
</b-col>
<b-col sm="6" lg="3">
Expand All @@ -34,7 +34,7 @@
<h4 class="mb-0">9.823</h4>
<p>Members online</p>
</b-card-body>
<card-line2-chart-example chartId="card-chart-02" class="chart-wrapper px-3" style="height:70px;" height="70"/>
<card-line2-chart-example chartId="card-chart-02" class="chart-wrapper px-3" style="height:70px;" :height="70"/>
</b-card>
</b-col>
<b-col sm="6" lg="3">
Expand Down Expand Up @@ -568,3 +568,10 @@ export default {
}
}
</script>

<style>
/* IE fix */
#card-chart-01, #card-chart-02 {
width: 100% !important;
}
</style>
3 changes: 1 addition & 2 deletions src/views/dashboard/CalloutChartExample.vue
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
<script>
import { Line } from 'vue-chartjs'
import { CustomTooltips } from '@coreui/coreui-plugin-chartjs-custom-tooltips'
// import { getStyle } from '@coreui/coreui/dist/js/coreui-utilities'
import getStyle from '../../utils/getStyle'
import { getStyle } from '@coreui/coreui/dist/js/coreui-utilities'

export default {
components: {
Expand Down
3 changes: 1 addition & 2 deletions src/views/dashboard/CardLine1ChartExample.vue
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
<script>
import { Line } from 'vue-chartjs'
import { CustomTooltips } from '@coreui/coreui-plugin-chartjs-custom-tooltips'
// import { getStyle } from '@coreui/coreui/dist/js/coreui-utilities'
import getStyle from '../../utils/getStyle'
import { getStyle } from '@coreui/coreui/dist/js/coreui-utilities'

export default {
extends: Line,
Expand Down
3 changes: 1 addition & 2 deletions src/views/dashboard/CardLine2ChartExample.vue
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
<script>
import { Line } from 'vue-chartjs'
import { CustomTooltips } from '@coreui/coreui-plugin-chartjs-custom-tooltips'
// import { getStyle } from '@coreui/coreui/dist/js/coreui-utilities'
import getStyle from '../../utils/getStyle'
import { getStyle } from '@coreui/coreui/dist/js/coreui-utilities'

export default {
extends: Line,
Expand Down
4 changes: 1 addition & 3 deletions src/views/dashboard/MainChartExample.vue
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
<script>
import { Line } from 'vue-chartjs'
// import { getStyle, hexToRgba } from '@coreui/coreui/dist/js/coreui-utilities'
import { hexToRgba } from '@coreui/coreui/dist/js/coreui-utilities'
import { getStyle, hexToRgba } from '@coreui/coreui/dist/js/coreui-utilities'
import { CustomTooltips } from '@coreui/coreui-plugin-chartjs-custom-tooltips'
import getStyle from '../../utils/getStyle'

function random (min, max) {
return Math.floor(Math.random() * (max - min + 1) + min)
Expand Down