Merge pull request #93 from coreui/dev-ie-getstyles

chore(release): v2.0.0-beta.3
coreui · Jun 5, 2018 · 234fde3 · 234fde3
2 parents 7a8847b + 1ed3681
commit 234fde3
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 23 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -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`

diff --git a/package.json b/package.json
@@ -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",
@@ -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",

diff --git a/src/utils/getStyle.js b/src/utils/getStyle.js
diff --git a/src/views/Dashboard.vue b/src/views/Dashboard.vue
@@ -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">
@@ -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">
@@ -568,3 +568,10 @@ export default {
   }
 }
 </script>
+
+<style>
+  /* IE fix */
+  #card-chart-01, #card-chart-02 {
+    width: 100% !important;
+  }
+</style>
diff --git a/src/views/dashboard/CalloutChartExample.vue b/src/views/dashboard/CalloutChartExample.vue
@@ -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: {

diff --git a/src/views/dashboard/CardLine1ChartExample.vue b/src/views/dashboard/CardLine1ChartExample.vue
@@ -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,

diff --git a/src/views/dashboard/CardLine2ChartExample.vue b/src/views/dashboard/CardLine2ChartExample.vue
@@ -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,

diff --git a/src/views/dashboard/MainChartExample.vue b/src/views/dashboard/MainChartExample.vue
@@ -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)