Skip to content

Commit a0f552b

Browse files
xidedixxidedix
committed
minor fixes
1 parent 64facb5 commit a0f552b

File tree

6 files changed

+38
-38
lines changed

6 files changed

+38
-38
lines changed

‎Vue_Full_Project/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,13 +64,13 @@
6464
"karma-webpack": "2.0.4",
6565
"lolex": "2.1.2",
6666
"mocha": "3.5.0",
67-
"chai": "4.1.1",
67+
"chai": "4.1.2",
6868
"sinon": "3.2.1",
6969
"sinon-chai": "2.13.0",
7070
"inject-loader": "3.0.1",
7171
"babel-plugin-istanbul": "4.1.4",
7272
"phantomjs-prebuilt": "^2.1.15",
73-
"chromedriver": "2.31.0",
73+
"chromedriver": "2.32.0",
7474
"cross-spawn": "^5.0.1",
7575
"nightwatch": "0.9.16",
7676
"selenium-server": "3.5.2",

‎Vue_Full_Project/scss/core/_callout.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@
1111

1212
.chart-wrapper {
1313
position: absolute;
14-
top: 18px;
14+
top: 10px;
1515
left: 50%;
1616
float: right;
17-
width: 60%;
17+
width: 50%;
1818
}
1919
}
2020

‎Vue_Full_Project/src/views/Dashboard.vue

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@
100100
<strong>29.703 Users (40%)</strong>
101101
<b-progress class="progress-xs mt-2" :precision="1" variant="success" :value="40"></b-progress>
102102
</li>
103-
<li class="hidden-sm-down">
103+
<li class="d-none d-md-table-cell">
104104
<div class="text-muted">Unique</div>
105105
<strong>24.093 Users (20%)</strong>
106106
<b-progress class="progress-xs mt-2" :precision="1" variant="info" :value="20"></b-progress>
@@ -110,12 +110,12 @@
110110
<strong>78.706 Views (60%)</strong>
111111
<b-progress class="progress-xs mt-2" :precision="1" variant="warning" :value="60"></b-progress>
112112
</li>
113-
<li class="hidden-sm-down">
113+
<li class="d-none d-md-table-cell">
114114
<div class="text-muted">New Users</div>
115115
<strong>22.123 Users (80%)</strong>
116116
<b-progress class="progress-xs mt-2" :precision="1" variant="danger" :value="80"></b-progress>
117117
</li>
118-
<li class="hidden-sm-down">
118+
<li class="d-none d-md-table-cell">
119119
<div class="text-muted">Bounce Rate</div>
120120
<strong>40.15%</strong>
121121
<b-progress class="progress-xs mt-2" :precision="1" :value="40"></b-progress>
@@ -207,7 +207,7 @@
207207
<Callout variant="info">
208208
<small class="text-muted">New Clients</small><br>
209209
<strong class="h4">9,123</strong>
210-
<div class="chart-wrapper" style="width:60%">
210+
<div class="chart-wrapper">
211211
<callout-chart-example :data="[35, 23, 56, 22, 97, 23, 64]" variant="#20a8d8" width="80" height="30" />
212212
</div>
213213
</Callout>
@@ -216,7 +216,7 @@
216216
<Callout variant="danger">
217217
<small class="text-muted">Recurring Clients</small><br>
218218
<strong class="h4">22,643</strong>
219-
<div class="chart-wrapper" style="width:60%">
219+
<div class="chart-wrapper">
220220
<callout-chart-example :data="[65, 59, 84, 84, 51, 55, 40]" variant="#f86c6b" width="80" height="30" />
221221
</div>
222222
</Callout>
@@ -298,7 +298,7 @@
298298
<Callout variant="warning">
299299
<small class="text-muted">Pageviews</small><br>
300300
<strong class="h4">78,623</strong>
301-
<div class="chart-wrapper" style="width:60%">
301+
<div class="chart-wrapper">
302302
<callout-chart-example :data="[35, 23, 56, 22, 97, 23, 64]" variant="#f8cb00" width="80" height="30" />
303303
</div>
304304
</Callout>
@@ -307,7 +307,7 @@
307307
<Callout variant="success">
308308
<small class="text-muted">Organic</small><br>
309309
<strong class="h4">49,123</strong>
310-
<div class="chart-wrapper" style="width:60%">
310+
<div class="chart-wrapper">
311311
<callout-chart-example :data="[65, 59, 84, 84, 51, 55, 40]" variant="#4dbd74" width="80px" height="30" />
312312
</div>
313313
</Callout>
@@ -375,7 +375,7 @@
375375
<Callout>
376376
<small class="text-muted">CTR</small><br>
377377
<strong class="h4">23%</strong>
378-
<div class="chart-wrapper" style="width:60%">
378+
<div class="chart-wrapper">
379379
<callout-chart-example :data="[78, 81, 80, 45, 34, 12, 40]" width="80px" height="30" />
380380
</div>
381381
</Callout>
@@ -384,8 +384,8 @@
384384
<Callout variant="primary">
385385
<small class="text-muted">Bounce Rate</small><br>
386386
<strong class="h4">5%</strong>
387-
<div class="chart-wrapper" style="width:60%">
388-
<callout-chart-example :data="[1, 13, 9, 17, 34, 41, 38]" variant="#20a8d8" width="80px" height="30" />
387+
<div class="chart-wrapper">
388+
<callout-chart-example :data="[35, 23, 56, 22, 97, 23, 64]" variant="#20a8d8" width="80px" height="30" />
389389
</div>
390390
</Callout>
391391
</div><!--/.col-->

‎Vue_Starter/package.json

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -14,31 +14,31 @@
1414
"lint": "eslint --ext .js,.vue src test/unit/specs test/e2e/specs"
1515
},
1616
"dependencies": {
17-
"bootstrap-vue": "0.20.1",
17+
"bootstrap-vue": "^0.23.0",
1818
"chart.js": "2.6.0",
1919
"vue": "2.4.2",
20-
"vue-chartjs": "2.8.1",
20+
"vue-chartjs": "2.8.2",
2121
"vue-router": "2.7.0",
2222
"font-awesome": "^4.7.0",
2323
"simple-line-icons": "^2.4.1"
2424
},
2525
"devDependencies": {
26-
"autoprefixer": "7.1.2",
27-
"babel-core": "6.25.0",
26+
"autoprefixer": "7.1.3",
27+
"babel-core": "6.26.0",
2828
"babel-eslint": "7.2.3",
29-
"babel-loader": "7.1.1",
29+
"babel-loader": "7.1.2",
3030
"babel-plugin-transform-runtime": "^6.22.0",
3131
"babel-preset-env": "1.6.0",
3232
"babel-preset-stage-2": "6.24.1",
33-
"babel-register": "6.24.1",
33+
"babel-register": "6.26.0",
3434
"chalk": "2.1.0",
3535
"connect-history-api-fallback": "^1.3.0",
3636
"copy-webpack-plugin": "^4.0.1",
37-
"css-loader": "0.28.4",
38-
"eslint": "4.4.1",
37+
"css-loader": "0.28.7",
38+
"eslint": "4.5.0",
3939
"eslint-friendly-formatter": "3.0.0",
4040
"eslint-loader": "1.9.0",
41-
"eslint-plugin-html": "3.1.1",
41+
"eslint-plugin-html": "3.2.0",
4242
"eslint-plugin-import": "2.7.0",
4343
"eslint-plugin-node": "5.1.1",
4444
"eslint-config-standard": "10.2.1",
@@ -53,38 +53,38 @@
5353
"http-proxy-middleware": "0.17.4",
5454
"webpack-bundle-analyzer": "2.9.0",
5555
"cross-env": "5.0.5",
56-
"karma": "1.7.0",
56+
"karma": "1.7.1",
5757
"karma-coverage": "^1.1.1",
5858
"karma-mocha": "^1.3.0",
5959
"karma-phantomjs-launcher": "1.0.4",
6060
"karma-phantomjs-shim": "^1.4.0",
61-
"karma-sinon-chai": "1.3.1",
61+
"karma-sinon-chai": "1.3.2",
6262
"karma-sourcemap-loader": "^0.3.7",
6363
"karma-spec-reporter": "0.0.31",
6464
"karma-webpack": "2.0.4",
6565
"lolex": "2.1.2",
6666
"mocha": "3.5.0",
67-
"chai": "4.1.1",
68-
"sinon": "3.2.0",
69-
"sinon-chai": "2.12.0",
67+
"chai": "4.1.2",
68+
"sinon": "3.2.1",
69+
"sinon-chai": "2.13.0",
7070
"inject-loader": "3.0.1",
7171
"babel-plugin-istanbul": "4.1.4",
72-
"phantomjs-prebuilt": "^2.1.14",
73-
"chromedriver": "2.31.0",
72+
"phantomjs-prebuilt": "^2.1.15",
73+
"chromedriver": "2.32.0",
7474
"cross-spawn": "^5.0.1",
7575
"nightwatch": "0.9.16",
76-
"selenium-server": "3.4.0",
76+
"selenium-server": "3.5.2",
7777
"semver": "5.4.1",
7878
"shelljs": "0.7.8",
7979
"opn": "5.1.0",
80-
"optimize-css-assets-webpack-plugin": "3.0.0",
80+
"optimize-css-assets-webpack-plugin": "3.1.1",
8181
"ora": "1.3.0",
8282
"rimraf": "^2.6.0",
8383
"url-loader": "0.5.9",
8484
"vue-loader": "13.0.4",
8585
"vue-style-loader": "3.0.1",
8686
"vue-template-compiler": "2.4.2",
87-
"webpack": "3.5.3",
87+
"webpack": "3.5.5",
8888
"webpack-dev-middleware": "1.12.0",
8989
"webpack-hot-middleware": "2.18.2",
9090
"webpack-merge": "4.1.0",

‎Vue_Starter/scss/core/_callout.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@
1111

1212
.chart-wrapper {
1313
position: absolute;
14-
top: 18px;
14+
top: 10px;
1515
left: 50%;
1616
float: right;
17-
width: 60%;
17+
width: 50%;
1818
}
1919
}
2020

‎Vue_Starter/scss/core/_temp.scss

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@
3131
}
3232

3333
//
34-
//.modal-open .modal {
35-
// display: block;
36-
//}
34+
.modal-open .modal {
35+
display: block;
36+
}
3737

3838
// navbar dropdown fix
3939
.navbar .dropdown-toggle {

0 commit comments

Comments
 (0)