Skip to content

Commit d250c46

Browse files
authored
Merge pull request #6 from creativetimofficial/dev-main
Feature: update to v1.1.0
2 parents e0247ed + f6e3cc2 commit d250c46

38 files changed

+1823
-1255
lines changed

.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -19,3 +19,5 @@ yarn-error.log*
1919
*.njsproj
2020
*.sln
2121
*.sw?
22+
23+
commit.sh

CHANGELOG.md

+65
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,70 @@
11
# Change Log
22

3+
## [1.1.0] 2021-03-19
4+
### Bug fixing
5+
- Rename `master` branch to `main`
6+
- To make a lot of our changes, we've followed the instructions from here (minus the `colors` and `font-sizes`): https://tailwindcss.com/docs/upgrading-to-v2
7+
- For the colors, the only change that we made, is the fact that we've added all Tailwind CSS colors to our `tailwind.config.js` files, and inside our product, all `{type}-gray-{number}` classes were renamed to `{type}-blueGray-{number}`
8+
- After that, we've changed `{type}-blueGray-{number}` to `{type}-blueGray-{lower-number}`, i.e. (`100` became `50`, `200` became `100`, ..., `900` became `800`)
9+
- You can achieve this, by search in your whole project for `blueGray-100` and replace it with `blueGray-50`
10+
- Then, you search in your whole project for `blueGray-200` and replace it with `blueGray-100`
11+
- Then, you search in your whole project for `blueGray-300` and replace it with `blueGray-200`
12+
- Then, you search in your whole project for `blueGray-400` and replace it with `blueGray-300`
13+
- Then, you search in your whole project for `blueGray-500` and replace it with `blueGray-400`
14+
- Then, you search in your whole project for `blueGray-600` and replace it with `blueGray-500`
15+
- Then, you search in your whole project for `blueGray-700` and replace it with `blueGray-600`
16+
- Then, you search in your whole project for `blueGray-800` and replace it with `blueGray-700`
17+
- Then, you search in your whole project for `blueGray-900` and replace it with `blueGray-800`
18+
- For the colors, the only change that we made, is the fact that we've added all Tailwind CSS colors to our `tailwind.config.js` files, and inside our product, all `{type}-blue-{number}` classes were renamed to `{type}-lightBlue-{number}`
19+
- For the colors, the only change that we made, is the fact that we've added all Tailwind CSS colors to our `tailwind.config.js` files, and inside our product, all `{type}-green-{number}` classes were renamed to `{type}-emerald-{number}`
20+
- `lg:bg-transparent` is not working anymore, so we've changed it with `lg:bg-opacity-0`
21+
- https://github.com/creativetimofficial/notus-angular/issues/4
22+
- https://github.com/creativetimofficial/notus-js/issues/4
23+
- https://github.com/creativetimofficial/notus-js/pull/5
24+
- https://github.com/creativetimofficial/notus-js/pull/6
25+
- https://github.com/creativetimofficial/notus-nextjs/issues/6
26+
- https://github.com/creativetimofficial/notus-nextjs/issues/7
27+
- https://github.com/creativetimofficial/notus-nextjs/issues/8
28+
- https://github.com/creativetimofficial/notus-react/issues/3
29+
- https://github.com/creativetimofficial/notus-svelte/issues/3
30+
- https://github.com/creativetimofficial/notus-svelte/issues/6
31+
- https://github.com/creativetimofficial/vue-notus/pull/4/
32+
### Major style changes
33+
- The upgrade of Tailwind CSS from version 1 to version 2, will cause multiple style changes, check them out on the official Tailwind CSS websites:
34+
- https://blog.tailwindcss.com/tailwindcss-v2
35+
- https://tailwindcss.com/
36+
- https://tailwindcss.com/docs/upgrading-to-v2
37+
### Deleted components
38+
### Added components
39+
### Deleted dependencies
40+
- `@tailwindcss/custom-forms`
41+
- `babel-eslint` (updated to `@babel/eslint-parser` and `@babel/core`)
42+
### Added dependencies
43+
- `@tailwindcss/forms` (replaces `@tailwindcss/custom-forms`)
44+
- `autoprefixer`
45+
- `postcss`
46+
- `@babel/core` (instead of `babel-eslint`)
47+
- `@babel/eslint-parser` (instead of `babel-eslint`)
48+
- `@vue/compiler-sfc`
49+
### Updated dependencies
50+
```
51+
@fortawesome/fontawesome-free 5.14.0 → 5.15.3
52+
@popperjs/core 2.5.1 → 2.9.1
53+
chart.js 2.9.3 → 2.9.4
54+
core-js 3.6.5 → 3.9.1
55+
tailwindcss 1.8.10 → 2.0.4
56+
vue 2.6.12 → 3.0.7
57+
vue-router 3.4.3 → 4.0.5
58+
@vue/cli-plugin-babel 4.5.6 → 5.0.0-alpha.7
59+
@vue/cli-plugin-eslint 4.5.6 → 5.0.0-alpha.7
60+
@vue/cli-service 4.5.6 → 5.0.0-alpha.7
61+
eslint 6.8.0 → 7.22.0
62+
eslint-plugin-vue 6.2.2 → 7.7.0
63+
```
64+
### Warning
65+
_On a clean install there may be some warnings from request, chokidar, fsevents - they come from node_modules, and they do not affect the product at all._
66+
_The following warning will show when doing a clean install `npm WARN cache-loader@4.1.0 requires a peer of webpack@^4.0.0 but none is installed. You must install peer dependencies yourself.`, however it does not affect in any way the product._
67+
368
## [1.0.0] 2020-09-29
469
### Original Release
570
- Started project from [Tailwind Starter Kit by Creative Tim](https://www.creative-tim.com/learning-lab/tailwind-starter-kit/presentation?ref=vn-changelog)

LICENSE.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
MIT License
22

3-
Copyright (c) 2020 Creative Tim (https://www.creative-tim.com?ref=vn-license)
3+
Copyright (c) 2021 Creative Tim (https://www.creative-tim.com?ref=vn-license)
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
66

README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Vue Notus <a href="https://twitter.com/intent/tweet?url=https%3A%2F%2Fdemos.creative-tim.com%2Fvue-notus%2F%23%2F&text=Start%20your%20development%20with%20a%20Free%20Tailwind%20CSS%20and%20VueJS%20UI%20Kit%20and%20Admin.%20Let%20Vue%20Notus%20amaze%20you%20with%20its%20cool%20features%20and%20build%20tools%20and%20get%20your%20project%20to%20a%20whole%20new%20level.%20" target="_blank">![Tweet](https://img.shields.io/twitter/url/http/shields.io.svg?style=social&logo=twitter)</a>
22

3-
![version](https://img.shields.io/badge/version-1.0.0-blue.svg) ![license](https://img.shields.io/badge/license-MIT-blue.svg) <a href="https://github.com/creativetimofficial/vue-notus/issues?q=is%3Aopen+is%3Aissue" target="_blank">![GitHub issues open](https://img.shields.io/github/issues/creativetimofficial/vue-notus.svg)</a> <a href="https://github.com/creativetimofficial/vue-notus/issues?q=is%3Aissue+is%3Aclosed" target="_blank">![GitHub issues closed](https://img.shields.io/github/issues-closed-raw/creativetimofficial/vue-notus.svg)</a> <a href="https://gitter.im/creative-tim-general/Lobby" target="_blank">![Join the chat at https://gitter.im/NIT-dgp/General](https://badges.gitter.im/NIT-dgp/General.svg)</a> <a href="https://discord.gg/E4aHAQy" target="_blank">![Chat](https://img.shields.io/badge/chat-on%20discord-7289da.svg)</a>
3+
![version](https://img.shields.io/badge/version-1.1.0-blue.svg) ![license](https://img.shields.io/badge/license-MIT-blue.svg) <a href="https://github.com/creativetimofficial/vue-notus/issues?q=is%3Aopen+is%3Aissue" target="_blank">![GitHub issues open](https://img.shields.io/github/issues/creativetimofficial/vue-notus.svg)</a> <a href="https://github.com/creativetimofficial/vue-notus/issues?q=is%3Aissue+is%3Aclosed" target="_blank">![GitHub issues closed](https://img.shields.io/github/issues-closed-raw/creativetimofficial/vue-notus.svg)</a> <a href="https://gitter.im/creative-tim-general/Lobby" target="_blank">![Join the chat at https://gitter.im/NIT-dgp/General](https://badges.gitter.im/NIT-dgp/General.svg)</a> <a href="https://discord.gg/E4aHAQy" target="_blank">![Chat](https://img.shields.io/badge/chat-on%20discord-7289da.svg)</a>
44

55
![Vue Notus](https://github.com/creativetimofficial/public-assets/blob/master/vue-notus/vue-notus.jpg?raw=true)
66

@@ -200,9 +200,9 @@ We use GitHub Issues as the official bug tracker for the Vue Notus. Here are som
200200

201201
## Licensing
202202

203-
- Copyright 2020 <a href="https://www.creative-tim.com/?ref=vn-readme" target="_blank">Creative Tim</a>
203+
- Copyright 2021 <a href="https://www.creative-tim.com/?ref=vn-readme" target="_blank">Creative Tim</a>
204204

205-
- Licensed under <a href="https://github.com/creativetimofficial/vue-notus/blob/master/LICENSE.md" target="_blank">MIT</a>
205+
- Licensed under <a href="https://github.com/creativetimofficial/vue-notus/blob/main/LICENSE.md" target="_blank">MIT</a>
206206

207207
## Useful Links
208208

gulpfile.js

+9-9
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@ gulp.task("licenses", async function () {
99
gap.prependText(`/*!
1010
1111
=========================================================
12-
* Vue Notus - v1.0.0 based on Tailwind Starter Kit by Creative Tim
12+
* Vue Notus - v1.1.0 based on Tailwind Starter Kit by Creative Tim
1313
=========================================================
1414
1515
* Product Page: https://www.creative-tim.com/product/vue-notus
16-
* Copyright 2020 Creative Tim (https://www.creative-tim.com)
17-
* Licensed under MIT (https://github.com/creativetimofficial/vue-notus/blob/master/LICENSE.md)
16+
* Copyright 2021 Creative Tim (https://www.creative-tim.com)
17+
* Licensed under MIT (https://github.com/creativetimofficial/vue-notus/blob/main/LICENSE.md)
1818
1919
* Tailwind Starter Kit Page: https://www.creative-tim.com/learning-lab/tailwind-starter-kit/presentation
2020
@@ -35,12 +35,12 @@ gulp.task("licenses", async function () {
3535
gap.prependText(`<!--
3636
3737
=========================================================
38-
* Vue Notus - v1.0.0 based on Tailwind Starter Kit by Creative Tim
38+
* Vue Notus - v1.1.0 based on Tailwind Starter Kit by Creative Tim
3939
=========================================================
4040
4141
* Product Page: https://www.creative-tim.com/product/vue-notus
42-
* Copyright 2020 Creative Tim (https://www.creative-tim.com)
43-
* Licensed under MIT (https://github.com/creativetimofficial/vue-notus/blob/master/LICENSE.md)
42+
* Copyright 2021 Creative Tim (https://www.creative-tim.com)
43+
* Licensed under MIT (https://github.com/creativetimofficial/vue-notus/blob/main/LICENSE.md)
4444
4545
* Tailwind Starter Kit Page: https://www.creative-tim.com/learning-lab/tailwind-starter-kit/presentation
4646
@@ -61,12 +61,12 @@ gulp.task("licenses", async function () {
6161
gap.prependText(`/*!
6262
6363
=========================================================
64-
* Vue Notus - v1.0.0 based on Tailwind Starter Kit by Creative Tim
64+
* Vue Notus - v1.1.0 based on Tailwind Starter Kit by Creative Tim
6565
=========================================================
6666
6767
* Product Page: https://www.creative-tim.com/product/vue-notus
68-
* Copyright 2020 Creative Tim (https://www.creative-tim.com)
69-
* Licensed under MIT (https://github.com/creativetimofficial/vue-notus/blob/master/LICENSE.md)
68+
* Copyright 2021 Creative Tim (https://www.creative-tim.com)
69+
* Licensed under MIT (https://github.com/creativetimofficial/vue-notus/blob/main/LICENSE.md)
7070
7171
* Tailwind Starter Kit Page: https://www.creative-tim.com/learning-lab/tailwind-starter-kit/presentation
7272

package.json

+20-16
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "vue-notus",
33
"homepage": "https://demos.creative-tim.com/vue-notus/",
4-
"version": "1.0.0",
4+
"version": "1.1.0",
55
"description": "Vue Notus - A free Tailwind CSS and VueJS UI Kit and Admin by Creative Tim.",
66
"repository": "https://github.com/creativetimofficial/vue-notus",
77
"license": "MIT",
@@ -13,24 +13,28 @@
1313
"install:clean": "rm -rf node_modules/ && rm -rf package-lock.json && npm install && npm run build:tailwind && npm run serve"
1414
},
1515
"dependencies": {
16-
"@fortawesome/fontawesome-free": "5.14.0",
17-
"@popperjs/core": "2.5.1",
18-
"@tailwindcss/custom-forms": "0.2.1",
19-
"chart.js": "2.9.3",
20-
"core-js": "3.6.5",
16+
"@fortawesome/fontawesome-free": "5.15.3",
17+
"@popperjs/core": "2.9.1",
18+
"@tailwindcss/forms": "0.2.1",
19+
"@vue/compiler-sfc": "3.0.7",
20+
"chart.js": "2.9.4",
21+
"core-js": "3.9.1",
2122
"gulp": "4.0.2",
2223
"gulp-append-prepend": "1.0.8",
23-
"tailwindcss": "1.8.10",
24-
"vue": "2.6.12",
25-
"vue-router": "3.4.3"
24+
"tailwindcss": "2.0.4",
25+
"vue": "3.0.7",
26+
"vue-router": "4.0.5"
2627
},
2728
"devDependencies": {
28-
"@vue/cli-plugin-babel": "4.5.6",
29-
"@vue/cli-plugin-eslint": "4.5.6",
30-
"@vue/cli-service": "4.5.6",
31-
"babel-eslint": "10.1.0",
32-
"eslint": "6.8.0",
33-
"eslint-plugin-vue": "6.2.2",
29+
"@babel/core": "7.13.10",
30+
"@babel/eslint-parser": "7.13.10",
31+
"@vue/cli-plugin-babel": "5.0.0-alpha.7",
32+
"@vue/cli-plugin-eslint": "5.0.0-alpha.7",
33+
"@vue/cli-service": "5.0.0-alpha.7",
34+
"autoprefixer": "10.2.5",
35+
"eslint": "7.22.0",
36+
"eslint-plugin-vue": "7.7.0",
37+
"postcss": "8.2.8",
3438
"vue-template-compiler": "2.6.12"
3539
},
3640
"eslintConfig": {
@@ -44,7 +48,7 @@
4448
],
4549
"rules": {},
4650
"parserOptions": {
47-
"parser": "babel-eslint"
51+
"parser": "@babel/eslint-parser"
4852
}
4953
},
5054
"postcss": {

public/index.html

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<!--
22
=========================================================
3-
* Vue Notus - v1.0.0 based on Tailwind Starter Kit by Creative Tim
3+
* Vue Notus - v1.1.0 based on Tailwind Starter Kit by Creative Tim
44
=========================================================
55
66
* Product Page: https://www.creative-tim.com/product/vue-notus
7-
* Copyright 2020 Creative Tim (https://www.creative-tim.com)
8-
* Licensed under MIT (https://github.com/creativetimofficial/vue-notus/blob/master/LICENSE.md)
7+
* Copyright 2021 Creative Tim (https://www.creative-tim.com)
8+
* Licensed under MIT (https://github.com/creativetimofficial/vue-notus/blob/main/LICENSE.md)
99
1010
* Tailwind Starter Kit Page: https://www.creative-tim.com/learning-lab/tailwind-starter-kit/presentation
1111
@@ -29,10 +29,10 @@
2929
/>
3030
<script src="https://maps.googleapis.com/maps/api/js?key=YOUR_API_KEY"></script>
3131
<title>
32-
Tailwind Starter Kit by Creative Tim | Free and Open Source UI Kit
32+
Vue Notus by Creative Tim | Free and Open Source UI Kit
3333
</title>
3434
</head>
35-
<body class="text-gray-800 antialiased">
35+
<body class="text-blueGray-700 antialiased">
3636
<noscript>
3737
<strong
3838
>We're sorry but vue-notus doesn't work properly without JavaScript

0 commit comments

Comments
 (0)