Skip to content

Commit bb59230

Browse files
xidedixxidedix
authored
Merge pull request #124 from coreui/dev-vnext
v2.0.0
2 parents 9f9b7ed + 0a889b4 commit bb59230

File tree

5 files changed

+263
-251
lines changed

5 files changed

+263
-251
lines changed

‎CHANGELOG.md‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
## [vue](./README.md) version `changelog`
22

3-
##### `v2.0.0-next`
3+
##### `v2.0.0`
4+
- chore: update `@coreui/vue` to `2.0.0`
5+
- chore: update `@coreui/icons` to `0.3.0`
6+
- refactor(CoreUIIcons): move to `@coreui/icons v0.3.0`
7+
- fix(Dashboard): SocialBoxChartExample height
8+
- fix(Widgets): SocialBoxChartExample height
9+
- fix(Widgets): Income widgets cols
410
- test(unit): add test for User.vue
511
- test: add jest config for coverage
612

‎package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@coreui/coreui-free-vue-admin-template",
3-
"version": "2.0.0-rc.0",
3+
"version": "2.0.0",
44
"description": "Open Source Bootstrap Admin Template",
55
"author": "Łukasz Holeczek",
66
"homepage": "http://coreui.io",
@@ -16,8 +16,8 @@
1616
"dependencies": {
1717
"@coreui/coreui": "^2.0.4",
1818
"@coreui/coreui-plugin-chartjs-custom-tooltips": "^1.2.0",
19-
"@coreui/icons": "0.2.0",
20-
"@coreui/vue": "^2.0.0-rc.3",
19+
"@coreui/icons": "0.3.0",
20+
"@coreui/vue": "^2.0.0",
2121
"bootstrap": "^4.1.3",
2222
"bootstrap-vue": "^2.0.0-rc.11",
2323
"chart.js": "^2.7.2",

‎src/views/Dashboard.vue‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@
129129
<div class="brand-card-header bg-facebook">
130130
<i class="fa fa-facebook"></i>
131131
<div class="chart-wrapper">
132-
<social-box-chart-example chartId="box-chart-01" :data="[65, 59, 84, 84, 51, 55, 40]" height="90"/>
132+
<social-box-chart-example chartId="box-chart-01" :data="[65, 59, 84, 84, 51, 55, 40]" />
133133
</div>
134134
</div>
135135
<div class="brand-card-body">
@@ -149,7 +149,7 @@
149149
<div class="brand-card-header bg-twitter">
150150
<i class="fa fa-twitter"></i>
151151
<div class="chart-wrapper">
152-
<social-box-chart-example chartId="box-chart-02" :data="[1, 13, 9, 17, 34, 41, 38]" height="90"/>
152+
<social-box-chart-example chartId="box-chart-02" :data="[1, 13, 9, 17, 34, 41, 38]" />
153153
</div>
154154
</div>
155155
<div class="brand-card-body">
@@ -169,7 +169,7 @@
169169
<div class="brand-card-header bg-linkedin">
170170
<i class="fa fa-linkedin"></i>
171171
<div class="chart-wrapper">
172-
<social-box-chart-example chartId="box-chart-03" :data="[78, 81, 80, 45, 34, 12, 40]" height="90"/>
172+
<social-box-chart-example chartId="box-chart-03" :data="[78, 81, 80, 45, 34, 12, 40]" />
173173
</div>
174174
</div>
175175
<div class="brand-card-body">
@@ -189,7 +189,7 @@
189189
<div class="brand-card-header bg-google-plus">
190190
<i class="fa fa-google-plus"></i>
191191
<div class="chart-wrapper">
192-
<social-box-chart-example chartId="box-chart-04" :data="[35, 23, 56, 22, 97, 23, 64]" height="90"/>
192+
<social-box-chart-example chartId="box-chart-04" :data="[35, 23, 56, 22, 97, 23, 64]" />
193193
</div>
194194
</div>
195195
<div class="brand-card-body">

‎src/views/Widgets.vue‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969
</b-col>
7070
</b-row><!--/.row-->
7171
<b-row>
72-
<b-col cols="6" lg="3">
72+
<b-col cols="12" sm="6" lg="3">
7373
<b-card :no-body="true">
7474
<b-card-body class="p-3 clearfix">
7575
<i class="fa fa-cogs bg-primary p-3 font-2xl mr-3 float-left"></i>
@@ -78,7 +78,7 @@
7878
</b-card-body>
7979
</b-card>
8080
</b-col>
81-
<b-col cols="6" lg="3">
81+
<b-col cols="12" sm="6" lg="3">
8282
<b-card :no-body="true">
8383
<b-card-body class="p-3 clearfix">
8484
<i class="fa fa-laptop bg-info p-3 font-2xl mr-3 float-left"></i>
@@ -87,7 +87,7 @@
8787
</b-card-body>
8888
</b-card>
8989
</b-col>
90-
<b-col cols="6" lg="3">
90+
<b-col cols="12" sm="6" lg="3">
9191
<b-card :no-body="true">
9292
<b-card-body class="p-3 clearfix">
9393
<i class="fa fa-moon-o bg-warning p-3 font-2xl mr-3 float-left"></i>
@@ -96,7 +96,7 @@
9696
</b-card-body>
9797
</b-card>
9898
</b-col>
99-
<b-col cols="6" lg="3">
99+
<b-col cols="12" sm="6" lg="3">
100100
<b-card :no-body="true">
101101
<b-card-body class="p-3 clearfix">
102102
<i class="fa fa-bell bg-danger p-3 font-2xl mr-3 float-left"></i>
@@ -105,7 +105,7 @@
105105
</b-card-body>
106106
</b-card>
107107
</b-col>
108-
<b-col cols="6" lg="3">
108+
<b-col cols="12" sm="6" lg="3">
109109
<b-card :no-body="true" footer-class="px-3 py-2">
110110
<b-card-body class="p-3 clearfix">
111111
<i class="fa fa-cogs bg-primary p-3 font-2xl mr-3 float-left"></i>
@@ -117,7 +117,7 @@
117117
</div>
118118
</b-card>
119119
</b-col>
120-
<b-col cols="6" lg="3">
120+
<b-col cols="12" sm="6" lg="3">
121121
<b-card :no-body="true" footer-class="px-3 py-2">
122122
<b-card-body class="p-3 clearfix">
123123
<i class="fa fa-laptop bg-info p-3 font-2xl mr-3 float-left"></i>
@@ -129,7 +129,7 @@
129129
</div>
130130
</b-card>
131131
</b-col>
132-
<b-col cols="6" lg="3">
132+
<b-col cols="12" sm="6" lg="3">
133133
<b-card :no-body="true" footer-class="px-3 py-2">
134134
<b-card-body class="p-3 clearfix">
135135
<i class="fa fa-moon-o bg-warning p-3 font-2xl mr-3 float-left"></i>
@@ -141,7 +141,7 @@
141141
</div>
142142
</b-card>
143143
</b-col>
144-
<b-col cols="6" lg="3">
144+
<b-col cols="12" sm="6" lg="3">
145145
<b-card :no-body="true" footer-class="px-3 py-2">
146146
<b-card-body class="p-3 clearfix">
147147
<i class="fa fa-bell bg-danger p-3 font-2xl mr-3 float-left"></i>
@@ -155,7 +155,7 @@
155155
</b-col>
156156
</b-row><!--/.row-->
157157
<b-row>
158-
<b-col cols="6" lg="3">
158+
<b-col cols="12" sm="6" lg="3">
159159
<b-card :no-body="true">
160160
<b-card-body class="p-0 clearfix">
161161
<i class="fa fa-cogs bg-primary p-4 font-2xl mr-3 float-left"></i>
@@ -164,7 +164,7 @@
164164
</b-card-body>
165165
</b-card>
166166
</b-col>
167-
<b-col cols="6" lg="3">
167+
<b-col cols="12" sm="6" lg="3">
168168
<b-card :no-body="true">
169169
<b-card-body class="p-0 clearfix">
170170
<i class="fa fa-laptop bg-info p-4 font-2xl mr-3 float-left"></i>
@@ -173,7 +173,7 @@
173173
</b-card-body>
174174
</b-card>
175175
</b-col>
176-
<b-col cols="6" lg="3">
176+
<b-col cols="12" sm="6" lg="3">
177177
<b-card :no-body="true">
178178
<b-card-body class="p-0 clearfix">
179179
<i class="fa fa-moon-o bg-warning p-4 font-2xl mr-3 float-left"></i>
@@ -182,7 +182,7 @@
182182
</b-card-body>
183183
</b-card>
184184
</b-col>
185-
<b-col cols="6" lg="3">
185+
<b-col cols="12" sm="6" lg="3">
186186
<b-card :no-body="true">
187187
<b-card-body class="p-0 clearfix">
188188
<i class="fa fa-bell bg-danger p-4 font-2xl mr-3 float-left"></i>
@@ -191,7 +191,7 @@
191191
</b-card-body>
192192
</b-card>
193193
</b-col>
194-
<b-col cols="6" lg="3">
194+
<b-col cols="12" sm="6" lg="3">
195195
<b-card :no-body="true">
196196
<b-card-body class="p-0 clearfix">
197197
<i class="fa fa-cogs bg-primary p-4 px-5 font-2xl mr-3 float-left"></i>
@@ -200,7 +200,7 @@
200200
</b-card-body>
201201
</b-card>
202202
</b-col>
203-
<b-col cols="6" lg="3">
203+
<b-col cols="12" sm="6" lg="3">
204204
<b-card :no-body="true">
205205
<b-card-body class="p-0 clearfix">
206206
<i class="fa fa-laptop bg-info p-4 px-5 font-2xl mr-3 float-left"></i>
@@ -209,7 +209,7 @@
209209
</b-card-body>
210210
</b-card>
211211
</b-col>
212-
<b-col cols="6" lg="3">
212+
<b-col cols="12" sm="6" lg="3">
213213
<b-card :no-body="true">
214214
<b-card-body class="p-0 clearfix">
215215
<i class="fa fa-moon-o bg-warning p-4 px-5 font-2xl mr-3 float-left"></i>
@@ -218,7 +218,7 @@
218218
</b-card-body>
219219
</b-card>
220220
</b-col>
221-
<b-col cols="6" lg="3">
221+
<b-col cols="12" sm="6" lg="3">
222222
<b-card :no-body="true">
223223
<b-card-body class="p-0 clearfix">
224224
<i class="fa fa-bell bg-danger p-4 px-5 font-2xl mr-3 float-left"></i>
@@ -234,7 +234,7 @@
234234
<div class="brand-card-header bg-facebook">
235235
<i class="fa fa-facebook"></i>
236236
<div class="chart-wrapper">
237-
<social-box-chart-example :data="[65, 59, 84, 84, 51, 55, 40]" height="90"/>
237+
<social-box-chart-example :data="[65, 59, 84, 84, 51, 55, 40]" />
238238
</div>
239239
</div>
240240
<div class="brand-card-body">
@@ -254,7 +254,7 @@
254254
<div class="brand-card-header bg-twitter">
255255
<i class="fa fa-twitter"></i>
256256
<div class="chart-wrapper">
257-
<social-box-chart-example :data="[1, 13, 9, 17, 34, 41, 38]" height="90"/>
257+
<social-box-chart-example :data="[1, 13, 9, 17, 34, 41, 38]" />
258258
</div>
259259
</div>
260260
<div class="brand-card-body">
@@ -274,7 +274,7 @@
274274
<div class="brand-card-header bg-linkedin">
275275
<i class="fa fa-linkedin"></i>
276276
<div class="chart-wrapper">
277-
<social-box-chart-example :data="[78, 81, 80, 45, 34, 12, 40]" height="90"/>
277+
<social-box-chart-example :data="[78, 81, 80, 45, 34, 12, 40]" />
278278
</div>
279279
</div>
280280
<div class="brand-card-body">
@@ -294,7 +294,7 @@
294294
<div class="brand-card-header bg-google-plus">
295295
<i class="fa fa-google-plus"></i>
296296
<div class="chart-wrapper">
297-
<social-box-chart-example :data="[35, 23, 56, 22, 97, 23, 64]" height="90"/>
297+
<social-box-chart-example :data="[35, 23, 56, 22, 97, 23, 64]" />
298298
</div>
299299
</div>
300300
<div class="brand-card-body">

0 commit comments

Comments
 (0)