Merge pull request #124 from coreui/dev-vnext

v2.0.0
coreui · Aug 30, 2018 · bb59230 · bb59230
2 parents 9f9b7ed + 0a889b4
commit bb59230
Show file tree

Hide file tree

Showing 5 changed files with 263 additions and 251 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,12 @@
 ## [vue](./README.md) version `changelog`
 
-##### `v2.0.0-next`
+##### `v2.0.0`
+- chore: update `@coreui/vue` to `2.0.0`
+- chore: update `@coreui/icons` to `0.3.0`
+- refactor(CoreUIIcons): move to `@coreui/icons v0.3.0`
+- fix(Dashboard): SocialBoxChartExample height
+- fix(Widgets): SocialBoxChartExample height 
+- fix(Widgets):  Income widgets cols
 - test(unit): add test for User.vue
 - test: add jest config for coverage
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@coreui/coreui-free-vue-admin-template",
-  "version": "2.0.0-rc.0",
+  "version": "2.0.0",
   "description": "Open Source Bootstrap Admin Template",
   "author": "Łukasz Holeczek",
   "homepage": "http://coreui.io",
@@ -16,8 +16,8 @@
   "dependencies": {
     "@coreui/coreui": "^2.0.4",
     "@coreui/coreui-plugin-chartjs-custom-tooltips": "^1.2.0",
-    "@coreui/icons": "0.2.0",
-    "@coreui/vue": "^2.0.0-rc.3",
+    "@coreui/icons": "0.3.0",
+    "@coreui/vue": "^2.0.0",
     "bootstrap": "^4.1.3",
     "bootstrap-vue": "^2.0.0-rc.11",
     "chart.js": "^2.7.2",

diff --git a/src/views/Dashboard.vue b/src/views/Dashboard.vue
@@ -129,7 +129,7 @@
           <div class="brand-card-header bg-facebook">
             <i class="fa fa-facebook"></i>
             <div class="chart-wrapper">
-              <social-box-chart-example chartId="box-chart-01" :data="[65, 59, 84, 84, 51, 55, 40]" height="90"/>
+              <social-box-chart-example chartId="box-chart-01" :data="[65, 59, 84, 84, 51, 55, 40]" />
             </div>
           </div>
           <div class="brand-card-body">
@@ -149,7 +149,7 @@
           <div class="brand-card-header bg-twitter">
             <i class="fa fa-twitter"></i>
             <div class="chart-wrapper">
-              <social-box-chart-example chartId="box-chart-02" :data="[1, 13, 9, 17, 34, 41, 38]" height="90"/>
+              <social-box-chart-example chartId="box-chart-02" :data="[1, 13, 9, 17, 34, 41, 38]" />
             </div>
           </div>
           <div class="brand-card-body">
@@ -169,7 +169,7 @@
           <div class="brand-card-header bg-linkedin">
             <i class="fa fa-linkedin"></i>
             <div class="chart-wrapper">
-              <social-box-chart-example chartId="box-chart-03" :data="[78, 81, 80, 45, 34, 12, 40]" height="90"/>
+              <social-box-chart-example chartId="box-chart-03" :data="[78, 81, 80, 45, 34, 12, 40]" />
             </div>
           </div>
           <div class="brand-card-body">
@@ -189,7 +189,7 @@
           <div class="brand-card-header bg-google-plus">
             <i class="fa fa-google-plus"></i>
             <div class="chart-wrapper">
-              <social-box-chart-example chartId="box-chart-04" :data="[35, 23, 56, 22, 97, 23, 64]" height="90"/>
+              <social-box-chart-example chartId="box-chart-04" :data="[35, 23, 56, 22, 97, 23, 64]" />
             </div>
           </div>
           <div class="brand-card-body">

diff --git a/src/views/Widgets.vue b/src/views/Widgets.vue
@@ -69,7 +69,7 @@
       </b-col>
     </b-row><!--/.row-->
     <b-row>
-      <b-col cols="6" lg="3">
+      <b-col cols="12" sm="6" lg="3">
         <b-card :no-body="true">
           <b-card-body class="p-3 clearfix">
             <i class="fa fa-cogs bg-primary p-3 font-2xl mr-3 float-left"></i>
@@ -78,7 +78,7 @@
           </b-card-body>
         </b-card>
       </b-col>
-      <b-col cols="6" lg="3">
+      <b-col cols="12" sm="6" lg="3">
         <b-card :no-body="true">
           <b-card-body class="p-3 clearfix">
             <i class="fa fa-laptop bg-info p-3 font-2xl mr-3 float-left"></i>
@@ -87,7 +87,7 @@
           </b-card-body>
         </b-card>
       </b-col>
-      <b-col cols="6" lg="3">
+      <b-col cols="12" sm="6" lg="3">
         <b-card :no-body="true">
           <b-card-body class="p-3 clearfix">
             <i class="fa fa-moon-o bg-warning p-3 font-2xl mr-3 float-left"></i>
@@ -96,7 +96,7 @@
           </b-card-body>
         </b-card>
       </b-col>
-      <b-col cols="6" lg="3">
+      <b-col cols="12" sm="6" lg="3">
         <b-card :no-body="true">
           <b-card-body class="p-3 clearfix">
             <i class="fa fa-bell bg-danger p-3 font-2xl mr-3 float-left"></i>
@@ -105,7 +105,7 @@
           </b-card-body>
         </b-card>
       </b-col>
-      <b-col cols="6" lg="3">
+      <b-col cols="12" sm="6" lg="3">
         <b-card :no-body="true" footer-class="px-3 py-2">
           <b-card-body class="p-3 clearfix">
             <i class="fa fa-cogs bg-primary p-3 font-2xl mr-3 float-left"></i>
@@ -117,7 +117,7 @@
           </div>
         </b-card>
       </b-col>
-      <b-col cols="6" lg="3">
+      <b-col cols="12" sm="6" lg="3">
         <b-card :no-body="true" footer-class="px-3 py-2">
           <b-card-body class="p-3 clearfix">
             <i class="fa fa-laptop bg-info p-3 font-2xl mr-3 float-left"></i>
@@ -129,7 +129,7 @@
           </div>
         </b-card>
       </b-col>
-      <b-col cols="6" lg="3">
+      <b-col cols="12" sm="6" lg="3">
         <b-card :no-body="true" footer-class="px-3 py-2">
           <b-card-body class="p-3 clearfix">
             <i class="fa fa-moon-o bg-warning p-3 font-2xl mr-3 float-left"></i>
@@ -141,7 +141,7 @@
           </div>
         </b-card>
       </b-col>
-      <b-col cols="6" lg="3">
+      <b-col cols="12" sm="6" lg="3">
         <b-card :no-body="true" footer-class="px-3 py-2">
           <b-card-body class="p-3 clearfix">
             <i class="fa fa-bell bg-danger p-3 font-2xl mr-3 float-left"></i>
@@ -155,7 +155,7 @@
       </b-col>
     </b-row><!--/.row-->
     <b-row>
-      <b-col cols="6" lg="3">
+      <b-col cols="12" sm="6" lg="3">
         <b-card :no-body="true">
           <b-card-body class="p-0 clearfix">
             <i class="fa fa-cogs bg-primary p-4 font-2xl mr-3 float-left"></i>
@@ -164,7 +164,7 @@
           </b-card-body>
         </b-card>
       </b-col>
-      <b-col cols="6" lg="3">
+      <b-col cols="12" sm="6" lg="3">
         <b-card :no-body="true">
           <b-card-body class="p-0 clearfix">
             <i class="fa fa-laptop bg-info p-4 font-2xl mr-3 float-left"></i>
@@ -173,7 +173,7 @@
           </b-card-body>
         </b-card>
       </b-col>
-      <b-col cols="6" lg="3">
+      <b-col cols="12" sm="6" lg="3">
         <b-card :no-body="true">
           <b-card-body class="p-0 clearfix">
             <i class="fa fa-moon-o bg-warning p-4 font-2xl mr-3 float-left"></i>
@@ -182,7 +182,7 @@
           </b-card-body>
         </b-card>
       </b-col>
-      <b-col cols="6" lg="3">
+      <b-col cols="12" sm="6" lg="3">
         <b-card :no-body="true">
           <b-card-body class="p-0 clearfix">
             <i class="fa fa-bell bg-danger p-4 font-2xl mr-3 float-left"></i>
@@ -191,7 +191,7 @@
           </b-card-body>
         </b-card>
       </b-col>
-      <b-col cols="6" lg="3">
+      <b-col cols="12" sm="6" lg="3">
         <b-card :no-body="true">
           <b-card-body class="p-0 clearfix">
             <i class="fa fa-cogs bg-primary p-4 px-5 font-2xl mr-3 float-left"></i>
@@ -200,7 +200,7 @@
           </b-card-body>
         </b-card>
       </b-col>
-      <b-col cols="6" lg="3">
+      <b-col cols="12" sm="6" lg="3">
         <b-card :no-body="true">
           <b-card-body class="p-0 clearfix">
             <i class="fa fa-laptop bg-info p-4 px-5 font-2xl mr-3 float-left"></i>
@@ -209,7 +209,7 @@
           </b-card-body>
         </b-card>
       </b-col>
-      <b-col cols="6" lg="3">
+      <b-col cols="12" sm="6" lg="3">
         <b-card :no-body="true">
           <b-card-body class="p-0 clearfix">
             <i class="fa fa-moon-o bg-warning p-4 px-5 font-2xl mr-3 float-left"></i>
@@ -218,7 +218,7 @@
           </b-card-body>
         </b-card>
       </b-col>
-      <b-col cols="6" lg="3">
+      <b-col cols="12" sm="6" lg="3">
         <b-card :no-body="true">
           <b-card-body class="p-0 clearfix">
             <i class="fa fa-bell bg-danger p-4 px-5 font-2xl mr-3 float-left"></i>
@@ -234,7 +234,7 @@
           <div class="brand-card-header bg-facebook">
             <i class="fa fa-facebook"></i>
             <div class="chart-wrapper">
-              <social-box-chart-example :data="[65, 59, 84, 84, 51, 55, 40]" height="90"/>
+              <social-box-chart-example :data="[65, 59, 84, 84, 51, 55, 40]" />
             </div>
           </div>
           <div class="brand-card-body">
@@ -254,7 +254,7 @@
           <div class="brand-card-header bg-twitter">
             <i class="fa fa-twitter"></i>
             <div class="chart-wrapper">
-              <social-box-chart-example :data="[1, 13, 9, 17, 34, 41, 38]" height="90"/>
+              <social-box-chart-example :data="[1, 13, 9, 17, 34, 41, 38]" />
             </div>
           </div>
           <div class="brand-card-body">
@@ -274,7 +274,7 @@
           <div class="brand-card-header bg-linkedin">
             <i class="fa fa-linkedin"></i>
             <div class="chart-wrapper">
-              <social-box-chart-example :data="[78, 81, 80, 45, 34, 12, 40]" height="90"/>
+              <social-box-chart-example :data="[78, 81, 80, 45, 34, 12, 40]" />
             </div>
           </div>
           <div class="brand-card-body">
@@ -294,7 +294,7 @@
           <div class="brand-card-header bg-google-plus">
             <i class="fa fa-google-plus"></i>
             <div class="chart-wrapper">
-              <social-box-chart-example :data="[35, 23, 56, 22, 97, 23, 64]" height="90"/>
+              <social-box-chart-example :data="[35, 23, 56, 22, 97, 23, 64]" />
             </div>
           </div>
           <div class="brand-card-body">