Skip to content

Commit f244f02

Browse files
mrholekmrholek
committed
- Update Vue to 2.5.2
- Update Vue Router to 3.0.0 - Fix height and position problems with .fixed-footer - Fix mobile sidebar height - Fix mobile breadcrumb position with .fixed-breadcrumb - Add new navbar toggler icon - Update old bootstrap classes ex. `hidden-sm-down`
1 parent 96f2aff commit f244f02

29 files changed

+249
-191
lines changed

‎Vue_Full_Project/CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
## [vue](./README.md) version `changelog`
2+
3+
###### `v1.0.2`
4+
- moved to vue: `^2.5.x`
5+
- (vue `v2.5.x`) deprecated `<template scope="props">` replaced with `<div slot-scope="props">`
6+
- `HeaderDropdown` component added to `Header`
7+
- moved to component `b-badge` (bootstrap-vue)
8+

‎Vue_Full_Project/package.json

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@coreui/vue",
3-
"version": "1.0.1",
3+
"version": "1.0.2",
44
"description": "",
55
"author": "Łukasz Holeczek <lukasz@holeczek.pl>",
66
"private": true,
@@ -19,36 +19,36 @@
1919
"font-awesome": "^4.7.0",
2020
"is-url-external": "^1.0.3",
2121
"simple-line-icons": "^2.4.1",
22-
"vue": "2.4.4",
22+
"vue": "^2.5.2",
2323
"vue-chartjs": "2.8.7",
24-
"vue-router": "2.7.0"
24+
"vue-router": "^3.0.1"
2525
},
2626
"devDependencies": {
27-
"autoprefixer": "7.1.4",
27+
"autoprefixer": "7.1.5",
2828
"babel-core": "6.26.0",
29-
"babel-eslint": "8.0.0",
29+
"babel-eslint": "8.0.1",
3030
"babel-loader": "7.1.2",
3131
"babel-plugin-transform-runtime": "^6.22.0",
3232
"babel-preset-env": "1.6.0",
3333
"babel-preset-stage-2": "6.24.1",
3434
"babel-register": "6.26.0",
3535
"chalk": "2.1.0",
36-
"connect-history-api-fallback": "^1.3.0",
37-
"copy-webpack-plugin": "^4.0.1",
36+
"connect-history-api-fallback": "^1.4.0",
37+
"copy-webpack-plugin": "^4.1.1",
3838
"css-loader": "0.28.7",
39-
"eslint": "4.7.2",
39+
"eslint": "^4.9.0",
4040
"eslint-friendly-formatter": "3.0.0",
4141
"eslint-loader": "1.9.0",
4242
"eslint-plugin-html": "3.2.2",
4343
"eslint-plugin-import": "2.7.0",
44-
"eslint-plugin-node": "5.1.1",
44+
"eslint-plugin-node": "5.2.0",
4545
"eslint-config-standard": "10.2.1",
46-
"eslint-plugin-promise": "3.5.0",
46+
"eslint-plugin-promise": "^3.6.0",
4747
"eslint-plugin-standard": "3.0.1",
4848
"eventsource-polyfill": "^0.9.6",
49-
"express": "4.15.5",
50-
"extract-text-webpack-plugin": "3.0.0",
51-
"file-loader": "0.11.2",
49+
"express": "4.16.2",
50+
"extract-text-webpack-plugin": "3.0.1",
51+
"file-loader": "1.1.5",
5252
"friendly-errors-webpack-plugin": "1.6.1",
5353
"html-webpack-plugin": "2.30.1",
5454
"http-proxy-middleware": "0.17.4",
@@ -62,32 +62,32 @@
6262
"karma-sinon-chai": "1.3.2",
6363
"karma-sourcemap-loader": "^0.3.7",
6464
"karma-spec-reporter": "0.0.31",
65-
"karma-webpack": "2.0.4",
66-
"lolex": "2.1.2",
67-
"mocha": "3.5.3",
65+
"karma-webpack": "^2.0.5",
66+
"lolex": "2.1.3",
67+
"mocha": "4.0.1",
6868
"chai": "4.1.2",
69-
"sinon": "3.3.0",
70-
"sinon-chai": "2.13.0",
69+
"sinon": "4.0.1",
70+
"sinon-chai": "2.14.0",
7171
"inject-loader": "3.0.1",
7272
"babel-plugin-istanbul": "4.1.5",
7373
"phantomjs-prebuilt": "^2.1.15",
74-
"chromedriver": "2.32.3",
74+
"chromedriver": "2.33.1",
7575
"cross-spawn": "^5.0.1",
7676
"nightwatch": "0.9.16",
77-
"selenium-server": "3.5.3",
77+
"selenium-server": "3.6.0",
7878
"semver": "5.4.1",
7979
"shelljs": "0.7.8",
8080
"opn": "5.1.0",
8181
"optimize-css-assets-webpack-plugin": "3.2.0",
8282
"ora": "1.3.0",
8383
"rimraf": "2.6.2",
84-
"url-loader": "0.5.9",
85-
"vue-loader": "13.0.5",
84+
"url-loader": "0.6.2",
85+
"vue-loader": "13.3.0",
8686
"vue-style-loader": "3.0.3",
87-
"vue-template-compiler": "2.4.4",
88-
"webpack": "3.6.0",
89-
"webpack-dev-middleware": "1.12.0",
90-
"webpack-hot-middleware": "2.19.1",
87+
"vue-template-compiler": "^2.5.2",
88+
"webpack": "^3.7.1",
89+
"webpack-dev-middleware": "^1.12.0",
90+
"webpack-hot-middleware": "^2.20.0",
9191
"webpack-merge": "4.1.0",
9292
"node-sass": "4.5.3",
9393
"sass-loader": "6.0.6"

‎Vue_Full_Project/scss/core/_dropdown-menu-right.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@
55
right: auto;
66
}
77
}
8-
}
8+
}

‎Vue_Full_Project/scss/core/_footer.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
.app-footer {
22
display: flex;
3+
flex-wrap: wrap;
4+
align-items: center;
35
padding: 0 $spacer;
46
color: $footer-color;
57
background: $footer-bg;
6-
flex-wrap: wrap;
7-
align-items: center;
88
@include borders($footer-borders);
99
}

‎Vue_Full_Project/scss/core/_layout.scss

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
app-dashboard,
1212
app-root {
1313
display: flex;
14-
min-height: 100vh;
1514
flex-direction: column;
15+
min-height: 100vh;
1616
}
1717

1818
.app-header {
@@ -26,12 +26,12 @@ app-root {
2626
.app-body {
2727
display: flex;
2828
flex-direction: row;
29-
overflow-x: hidden;
3029
flex-grow: 1;
30+
overflow-x: hidden;
3131

3232
.main {
33-
min-width: 0;
3433
flex: 1;
34+
min-width: 0;
3535
}
3636

3737
.sidebar {
@@ -269,9 +269,11 @@ app-root {
269269
.footer-fixed {
270270
.app-footer {
271271
position: fixed;
272+
right: 0;
272273
bottom: 0;
274+
left: 0;
273275
z-index: $zindex-sticky;
274-
width: 100%;
276+
height: $footer-height;
275277
}
276278

277279
.app-body {
@@ -328,17 +330,26 @@ app-root {
328330
margin-top: $navbar-height;
329331
}
330332

333+
.breadcrumb-fixed {
334+
.main:nth-child(2) .breadcrumb {
335+
right: auto;
336+
left: auto;
337+
width: 100%;
338+
}
339+
}
340+
331341
.sidebar,
332342
.sidebar-fixed .sidebar {
333343
position: fixed;
334344
z-index: $zindex-sticky - 1;
335345
width: $mobile-sidebar-width;
336-
height: 100%;
346+
// height: 100%;
337347
margin-left: - $mobile-sidebar-width;
338348

339349
.sidebar-nav,
340350
.nav {
341351
width: $mobile-sidebar-width !important;
352+
height: calc(100vh - #{$navbar-height});
342353
}
343354

344355
.sidebar-minimizer {
@@ -364,22 +375,11 @@ app-root {
364375
.sidebar {
365376
width: $mobile-sidebar-width;
366377
margin-left: 0;
367-
368-
.sidebar-nav {
369-
height: calc(100vh - #{$navbar-height});
370-
}
371378
}
372379

373380
.main {
374381
margin-right: - $mobile-sidebar-width !important;
375382
margin-left: $mobile-sidebar-width !important;
376383
}
377384
}
378-
379-
.breadcrumb-fixed {
380-
.main .breadcrumb {
381-
right: 0 !important;
382-
left: 0 !important;
383-
}
384-
}
385385
}

‎Vue_Full_Project/scss/core/_navbar.scss

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
.app-header.navbar {
22
position: relative;
3-
height: $navbar-height;
43
flex-direction: row;
4+
height: $navbar-height;
55
padding: 0;
66
margin: 0;
77
background-color: $navbar-bg;
@@ -22,7 +22,17 @@
2222
}
2323

2424
.navbar-toggler {
25-
color: $navbar-color;
25+
min-width: 50px;
26+
padding: $navbar-toggler-padding-y 0;
27+
28+
&:hover .navbar-toggler-icon {
29+
background-image: $navbar-toggler-icon-hover;
30+
}
31+
}
32+
33+
.navbar-toggler-icon {
34+
height: 23px;
35+
background-image: $navbar-toggler-icon;
2636
}
2737

2838
.navbar-nav {

‎Vue_Full_Project/scss/core/_sidebar.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,8 @@
7878

7979
.nav {
8080
@include sidebar-width($sidebar-borders, $sidebar-width);
81-
min-height: 100%;
8281
flex-direction: column;
82+
min-height: 100%;
8383
}
8484

8585
.nav-title {

‎Vue_Full_Project/scss/core/_variables.scss

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,9 @@ $navbar-hover-color: $gray-800 !default;
6969
$navbar-active-color: $gray-800 !default;
7070
$navbar-disabled-color: $gray-300 !default;
7171

72+
$navbar-toggler-icon: str-replace(url("data:image/svg+xml;charset=utf8,%3Csvg viewBox='0 0 30 30' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath stroke='#{$navbar-color}' stroke-width='2.25' stroke-linecap='round' stroke-miterlimit='10' d='M4 7h22M4 15h22M4 23h22'/%3E%3C/svg%3E"), "#", "%23") !default;
73+
$navbar-toggler-icon-hover: str-replace(url("data:image/svg+xml;charset=utf8,%3Csvg viewBox='0 0 30 30' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath stroke='#{$navbar-hover-color}' stroke-width='2.25' stroke-linecap='round' stroke-miterlimit='10' d='M4 7h22M4 15h22M4 23h22'/%3E%3C/svg%3E"), "#", "%23") !default;
74+
7275
// Sidebar
7376

7477
$sidebar-width: 200px !default;

‎Vue_Full_Project/scss/style.scss

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
/*!
22
* CoreUI - Open Source Bootstrap Admin Template
3-
* @version v1.0.1
3+
* @version v1.0.2
44
* @link http://coreui.io
55
* Copyright (c) 2017 creativeLabs Łukasz Holeczek
66
* @license MIT
77
*/
8+
89
// Override Boostrap variables
910
@import "bootstrap-variables";
1011

‎Vue_Full_Project/src/components/Aside.vue

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@
9393
<div class="py-3 pb-5 mr-3 float-left">
9494
<div class="avatar">
9595
<img src="static/img/avatars/7.jpg" class="img-avatar" alt="admin@bootstrapmaster.com">
96-
<span class="avatar-status badge-success"></span>
96+
<b-badge variant="success" class="avatar-status" ></b-badge>
9797
</div>
9898
</div>
9999
<div>
@@ -108,7 +108,7 @@
108108
<div class="py-3 pb-5 mr-3 float-left">
109109
<div class="avatar">
110110
<img src="static/img/avatars/7.jpg" class="img-avatar" alt="admin@bootstrapmaster.com">
111-
<span class="avatar-status badge-success"></span>
111+
<b-badge variant="success" class="avatar-status" ></b-badge>
112112
</div>
113113
</div>
114114
<div>
@@ -123,7 +123,7 @@
123123
<div class="py-3 pb-5 mr-3 float-left">
124124
<div class="avatar">
125125
<img src="static/img/avatars/7.jpg" class="img-avatar" alt="admin@bootstrapmaster.com">
126-
<span class="avatar-status badge-success"></span>
126+
<b-badge variant="success" class="avatar-status" ></b-badge>
127127
</div>
128128
</div>
129129
<div>
@@ -138,7 +138,7 @@
138138
<div class="py-3 pb-5 mr-3 float-left">
139139
<div class="avatar">
140140
<img src="static/img/avatars/7.jpg" class="img-avatar" alt="admin@bootstrapmaster.com">
141-
<span class="avatar-status badge-success"></span>
141+
<b-badge variant="success" class="avatar-status" ></b-badge>
142142
</div>
143143
</div>
144144
<div>
@@ -153,7 +153,7 @@
153153
<div class="py-3 pb-5 mr-3 float-left">
154154
<div class="avatar">
155155
<img src="static/img/avatars/7.jpg" class="img-avatar" alt="admin@bootstrapmaster.com">
156-
<span class="avatar-status badge-success"></span>
156+
<b-badge variant="success" class="avatar-status" ></b-badge>
157157
</div>
158158
</div>
159159
<div>

‎Vue_Full_Project/src/components/Breadcrumb.vue

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
<template>
22
<ol class="breadcrumb">
3-
<li class="breadcrumb-item" v-for="(item, index) in list"><span class="active" v-if="isLast(index)">{{ showName(item) }}</span>
4-
<router-link :to="item.path" v-else>{{ showName(item) }}</router-link>
3+
<li class="breadcrumb-item" v-for="(item, index) in list">
4+
<span class="active" v-if="isLast(index)">{{ showName(item) }}</span>
5+
<router-link :to="item" v-else>{{ showName(item) }}</router-link>
56
</li>
67
</ol>
78
</template>

0 commit comments

Comments
 (0)