From dabb6f3ddebc3d5d173cd1893c03b3fdd57a46b2 Mon Sep 17 00:00:00 2001 From: Travis CI User Date: Tue, 21 May 2019 07:32:12 +0000 Subject: [PATCH 1/3] [skip ci] chore(release): v2.4.0 --- CHANGELOG.md | 9 +++++++++ package.json | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b56b9b3..d7e1012 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,15 @@ All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines. +## [2.4.0](https://github.com/levy9527/nuxt-element-dashboard/compare/v2.3.4...v2.4.0) (2019-05-21) + + +### Features + +* **meta.js:** 将meta信息本地化 ([b197ff0](https://github.com/levy9527/nuxt-element-dashboard/commit/b197ff0)) + + + ### [2.3.4](https://github.com/levy9527/nuxt-element-dashboard/compare/v2.3.3...v2.3.4) (2019-05-17) diff --git a/package.json b/package.json index 2e2d537..329f08e 100755 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "nuxt-element-dashboard", - "version": "2.3.4", + "version": "2.4.0", "description": "Nuxt2 + element UI project", "author": "levy ", "license": "MIT", From 0e02a024a5bade029964f57afedead812aee2ac5 Mon Sep 17 00:00:00 2001 From: Travis CI User Date: Wed, 22 May 2019 06:56:50 +0000 Subject: [PATCH 2/3] [skip ci] chore(release): v2.4.1 --- CHANGELOG.md | 9 +++++++++ package.json | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d7e1012..f1e83af 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,15 @@ All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines. +### [2.4.1](https://github.com/levy9527/nuxt-element-dashboard/compare/v2.4.0...v2.4.1) (2019-05-22) + + +### Bug Fixes + +* 格式化出错误代码 ([385642e](https://github.com/levy9527/nuxt-element-dashboard/commit/385642e)) + + + ## [2.4.0](https://github.com/levy9527/nuxt-element-dashboard/compare/v2.3.4...v2.4.0) (2019-05-21) diff --git a/package.json b/package.json index 329f08e..9a7b82d 100755 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "nuxt-element-dashboard", - "version": "2.4.0", + "version": "2.4.1", "description": "Nuxt2 + element UI project", "author": "levy ", "license": "MIT", From f6efd9a254de3342829f4eabd11d49c8e3c968e8 Mon Sep 17 00:00:00 2001 From: Han Date: Tue, 28 May 2019 16:14:12 +0800 Subject: [PATCH 3/3] feat(styles): files about css style sheet manager in src/styles MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit also remove the global border-box, because we always use modern browser box model but not IE‘s box model Closes #15 --- README.md | 2 +- doc/dev.md | 7 ++++--- nuxt.config.js | 4 ++-- src/assets/README.md | 8 -------- src/{assets => styles}/global.less | 1 - src/{assets => styles}/var.less | 0 6 files changed, 7 insertions(+), 15 deletions(-) delete mode 100755 src/assets/README.md rename src/{assets => styles}/global.less (96%) mode change 100755 => 100644 rename src/{assets => styles}/var.less (100%) diff --git a/README.md b/README.md index 07f7d80..0094eef 100755 --- a/README.md +++ b/README.md @@ -60,7 +60,7 @@ yarn generate ├── nuxt.config.js 框架配置文件 ├── package.json ├── src 开发目录 -│   ├── assets 资源，包括样式文件与图片 +│   ├── styles 未编译的样式资源 │   │   ├── global.less 全局样式类 │   │   └── var.less 样式变量，支持less变量自动引入，即不用在less中import就能直接使用变量 │   ├── components 业务无关的可复用的组件 diff --git a/doc/dev.md b/doc/dev.md index 6cedec9..1ae815d 100755 --- a/doc/dev.md +++ b/doc/dev.md @@ -114,12 +114,13 @@ table 里空值就显示空白, 不需要显示占位符 `-` ### 统一 footer 样式 .data-table-footer -已写在 /assets/global.styl 可直接使用 +已写在 /styles/global.less 可直接使用 -```stylus -.data-table-footer +```less +.data-table-footer { margin-top 24px text-align right +} ``` ## form 表单 diff --git a/nuxt.config.js b/nuxt.config.js index 3ed711b..d1c4836 100755 --- a/nuxt.config.js +++ b/nuxt.config.js @@ -122,11 +122,11 @@ module.exports = { * @Link https://github.com/nuxt-community/style-resources-module/ */ styleResources: { - less: '~assets/var.less' + less: '~styles/var.less' }, css: [ { - src: '~assets/global.less', + src: '~styles/global.less', lang: 'less' } ], diff --git a/src/assets/README.md b/src/assets/README.md deleted file mode 100755 index c67cf2e..0000000 --- a/src/assets/README.md +++ /dev/null @@ -1,8 +0,0 @@ -# ASSETS - -This directory contains your un-compiled assets such as LESS, SASS, or JavaScript. - -More information about the usage of this directory in the documentation: -https://nuxtjs.org/guide/assets#webpacked - -**This directory is not required, you can delete it if you don't want to use it.** diff --git a/src/assets/global.less b/src/styles/global.less old mode 100755 new mode 100644 similarity index 96% rename from src/assets/global.less rename to src/styles/global.less index 12e3686..1c28f12 --- a/src/assets/global.less +++ b/src/styles/global.less @@ -8,7 +8,6 @@ body { } *, *:before, *:after { - box-sizing: border-box; margin: 0; } diff --git a/src/assets/var.less b/src/styles/var.less similarity index 100% rename from src/assets/var.less rename to src/styles/var.less