Skip to content

Commit 6cf8777

Browse files
committed
Update vue-template
1 parent aeb4fac commit 6cf8777

File tree

74 files changed

+48689
-1510
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

74 files changed

+48689
-1510
lines changed

coreui/package-lock.json

Lines changed: 1308 additions & 1420 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

coreui/package.json

Lines changed: 28 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,19 @@
11
{
22
"name": "@coreui/coreui-free-vue-admin-template",
3-
"version": "3.0.0-beta.1",
3+
"version": "3.0.0-beta.2",
44
"description": "Open Source Bootstrap Admin Template",
5-
"author": "Łukasz Holeczek",
5+
"author": {
6+
"name": "CoreUI",
7+
"url": "https://coreui.io",
8+
"github": "https://github.com/coreui",
9+
"twitter": "https://twitter.com/core_ui"
10+
},
11+
"contributors": [
12+
{
13+
"name": "CoreUI Team",
14+
"url": "https://github.com/orgs/coreui/people"
15+
}
16+
],
617
"homepage": "http://coreui.io",
718
"copyright": "Copyright 2019 creativeLabs Łukasz Holeczek",
819
"license": "MIT",
@@ -14,27 +25,27 @@
1425
"test:e2e": "vue-cli-service test:e2e"
1526
},
1627
"dependencies": {
17-
"@coreui/coreui": "3.0.0-beta.3",
18-
"@coreui/coreui-vue-chartjs": "1.0.0-alpha.2",
19-
"@coreui/icons": "1.0.0-beta.3",
20-
"axios": "^0.19.0",
21-
"@coreui/vue": "coreui/coreui-vue#3.0.0-beta.2",
28+
"@coreui/coreui": "^3.0.0-beta.3",
29+
"@coreui/coreui-vue-chartjs": "^1.0.0",
30+
"@coreui/icons": "^1.0.0-beta.3",
31+
"@coreui/vue": "coreui/coreui-vue#3.0.0-beta.3",
2232
"vue": "^2.6.10",
23-
"vue-router": "^3.1.3"
33+
"vue-router": "^3.1.3",
34+
"axios": "^0.19.0"
2435
},
2536
"devDependencies": {
26-
"@vue/cli-plugin-babel": "^4.0.5",
27-
"@vue/cli-plugin-e2e-nightwatch": "^4.0.5",
28-
"@vue/cli-plugin-eslint": "^4.0.5",
29-
"@vue/cli-plugin-unit-jest": "^4.0.5",
30-
"@vue/cli-service": "^4.0.5",
31-
"@vue/test-utils": "^1.0.0-beta.29",
32-
"@babel/core": "7.7.2",
37+
"@vue/cli-plugin-babel": "^4.1.1",
38+
"@vue/cli-plugin-e2e-nightwatch": "^4.1.1",
39+
"@vue/cli-plugin-eslint": "^4.1.1",
40+
"@vue/cli-plugin-unit-jest": "^4.1.1",
41+
"@vue/cli-service": "^4.1.1",
42+
"@vue/test-utils": "1.0.0-beta.29",
43+
"@babel/core": "7.7.4",
3344
"babel-eslint": "^10.0.3",
3445
"babel-jest": "^24.9.0",
35-
"core-js": "^3.4.1",
46+
"core-js": "^3.4.7",
3647
"chromedriver": "^78.0.1",
37-
"eslint": "^6.6.0",
48+
"eslint": "^6.7.2",
3849
"eslint-plugin-vue": "^6.0.1",
3950
"node-sass": "^4.13.0",
4051
"sass-loader": "^8.0.0",
Lines changed: 38 additions & 0 deletions
Loading

coreui/public/img/favicon.png

-7.02 KB
Binary file not shown.

coreui/public/img/logo-symbol.png

-7.02 KB
Binary file not shown.

coreui/public/img/logo.png

-14.7 KB
Binary file not shown.

coreui/src/assets/icons/icons.js

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ import {
4343
cilCheck,
4444
cilChevronBottom,
4545
cilChevronTop,
46-
// cilCircleCheck,
46+
cilCheckCircle,
4747
cilCommentSquare,
4848
cilCursor,
4949
cilDrop,
@@ -52,6 +52,7 @@ import {
5252
cilEnvelopeOpen,
5353
cilEuro,
5454
cilGlobeAlt,
55+
cilGrid,
5556
cilFile,
5657
cilJustifyCenter,
5758
cilLaptop,
@@ -62,6 +63,7 @@ import {
6263
cilLockLocked,
6364
cilMagnifyingGlass,
6465
cilMoon,
66+
cilOptions,
6567
cilPencil,
6668
cilPeople,
6769
cilPuzzle,
@@ -92,7 +94,7 @@ export const iconsSet = Object.assign(
9294
cilCheck,
9395
cilChevronBottom,
9496
cilChevronTop,
95-
// cilCircleCheck,
97+
cilCheckCircle,
9698
cilCommentSquare,
9799
cilCursor,
98100
cilDrop,
@@ -101,6 +103,7 @@ export const iconsSet = Object.assign(
101103
cilEnvelopeOpen,
102104
cilEuro,
103105
cilGlobeAlt,
106+
cilGrid,
104107
cilFile,
105108
cilJustifyCenter,
106109
cilLaptop,
@@ -111,6 +114,7 @@ export const iconsSet = Object.assign(
111114
cilLockLocked,
112115
cilMagnifyingGlass,
113116
cilMoon,
117+
cilOptions,
114118
cilPencil,
115119
cilPeople,
116120
cilPuzzle,

coreui/src/assets/scss/_custom.scss

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
// Here you can add other styles
22

33
.card-header > .c-icon:first-child {
4-
margin-right: 0.1rem;
5-
margin-top: 0.1rem;
6-
vertical-align: top;
7-
width: 1.2rem;
8-
height: 1.2rem;
9-
font-size: 1.2rem;
10-
}
4+
margin-right: 0.1rem;
5+
margin-top: 0.1rem;
6+
vertical-align: top;
7+
width: 1.2rem;
8+
height: 1.2rem;
9+
font-size: 1.2rem;
10+
}

coreui/src/assets/scss/style.scss

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,3 @@
1010
// If you want to add something do it here
1111
@import "custom";
1212

13-

coreui/src/containers/TheHeader.vue

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,10 @@
1212
/>
1313
<CHeaderBrand
1414
class="mx-auto d-lg-none"
15-
src="img/brand/coreui-base.svg"
16-
width="97"
15+
src="img/brand/coreui-vue-logo.svg"
16+
width="190"
1717
height="46"
1818
alt="CoreUI Logo"
19-
:wrappedInLink="{ href: 'https://coreui.io', target: '_blank'}"
2019
/>
2120
<CHeaderNav class="d-md-down-none mr-auto">
2221
<CHeaderNavItem class="px-3">

0 commit comments

Comments
 (0)