Skip to content
This repository was archived by the owner on Mar 4, 2025. It is now read-only.

feat: upgrade element-ui to 2.2.1 #41

Merged
merged 2 commits into from
Mar 12, 2018
Merged

feat: upgrade element-ui to 2.2.1 #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1e23fc3
fix: update element-ui from 1.4.9 to 2.2.1
marceloavf Mar 8, 2018
cb24cdf
fix: update style from theme-default to theme-chalk
marceloavf Mar 8, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion template/_package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"bootstrap": "^4.0.0-beta.2"<% } else if (ui === 'vuetify') { %>,
"vuetify": "^0.17.3"<% } else if (ui === 'bulma') { %>,
"@nuxtjs/bulma": "^1.0.3"<% } else if (ui === 'element-ui') { %>,
"element-ui": "^1.4.9"<% } %><% if (axios === 'yes') { %>,
"element-ui": "^2.2.1"<% } %><% if (axios === 'yes') { %>,
"@nuxtjs/axios": "^5.0.0"<% } %>
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion template/nuxt/nuxt.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ module.exports = {
** Global CSS
*/
css: [<% if (ui === 'element-ui') { %>
'element-ui/lib/theme-default/index.css'<% } else if (ui === 'tailwind') { %>
'element-ui/lib/theme-chalk/index.css'<% } else if (ui === 'tailwind') { %>
'~/assets/css/tailwind.css'<% } else if (ui === 'vuetify') { %>
'vuetify/src/stylus/main.styl'<% } %>
],
Expand Down