From 0b92c2f6a7ed0b89904e89971ee15773d4cc0cfd Mon Sep 17 00:00:00 2001 From: liyang <1711467488@qq.com> Date: Fri, 20 Jul 2018 17:09:36 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Former-commit-id: 2f9851f1d6ea4b55228795bd4ccfd36f1c78cf2c [formerly 2f9851f1d6ea4b55228795bd4ccfd36f1c78cf2c [formerly 2f9851f1d6ea4b55228795bd4ccfd36f1c78cf2c [formerly 2f9851f1d6ea4b55228795bd4ccfd36f1c78cf2c [formerly 1e2be03af8c1e899a0010438a0db5cb3c011983f [formerly 02bdfa97a8aebb601237d75109697ade07948483]]]]] Former-commit-id: b2e7221aa2dcdb20d9cc8a7222b98f5a3427601f Former-commit-id: 51442ed33afe2ca3aa35374e37652cba14f5198b Former-commit-id: 487976119d2dd2db7d5984d5b93be2a0dd42cf5e [formerly fbf72b4760b4416a69630af7a44a3fa43fd2e8a2] Former-commit-id: 03d720bf4827cff0ed406b64ae487025078d4fbd Former-commit-id: bda6b07fe65d3c499216da343c1cdf0db065f294 Former-commit-id: 17be2bd42175165470c943923214bb75b3beef6c Former-commit-id: 0d37132ff578ffa060c2f755664ac9faa24dfd07 Former-commit-id: 883a7c9bc897f6a5047a1d90423257a3d2894f38 --- LICENSE | 21 ++++++++++++++ README.md | 3 +- dev/github/qr@2x.png.REMOVED.git-id | 1 - src/assets/style/fixed/vue-splitpane.scss | 2 +- src/assets/style/public.scss | 2 +- .../style/unit/{_color.scss => color.scss} | 0 .../data/index.js.REMOVED.git-id | 2 +- src/components/demo/d2-page-cover/index.vue | 1 + src/pages/dashboard/page.vue | 9 ------ .../icon/data/index.js.REMOVED.git-id | 2 +- src/pages/demo/element/basic-color/index.vue | 2 +- .../image/icon.png.REMOVED.git-id | 0 src/pages/{dashboard => index}/index.js | 0 src/pages/index/page.vue | 29 +++++++++++++++++++ src/router/routes.js.REMOVED.git-id | 2 +- 15 files changed, 58 insertions(+), 18 deletions(-) create mode 100644 LICENSE delete mode 100644 dev/github/qr@2x.png.REMOVED.git-id rename src/assets/style/unit/{_color.scss => color.scss} (100%) delete mode 100644 src/pages/dashboard/page.vue rename src/pages/{dashboard => index}/image/icon.png.REMOVED.git-id (100%) rename src/pages/{dashboard => index}/index.js (100%) create mode 100644 src/pages/index/page.vue diff --git a/LICENSE b/LICENSE new file mode 100644 index 00000000..4b66e078 --- /dev/null +++ b/LICENSE @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2018 李杨 + +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: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/README.md b/README.md index 779679ba..177a77f1 100755 --- a/README.md +++ b/README.md @@ -90,11 +90,10 @@ D2Admin 是完全开源免费的管理系统集成方案，由 [FairyEver](https ## 觉得不错 赏个咖啡 让作者打起精神 ~ - 更多介绍和使用方法见 [文档](http://d2admin.fairyever.com/zh/) -## 朋友的开源项目 +## 友情链接 * [avue](https://github.com/nmxiaowei/avue) diff --git a/dev/github/qr@2x.png.REMOVED.git-id b/dev/github/qr@2x.png.REMOVED.git-id deleted file mode 100644 index dc0e85d9..00000000 --- a/dev/github/qr@2x.png.REMOVED.git-id +++ /dev/null @@ -1 +0,0 @@ -17502d4e47a0d11f5a1cec935f48229d7ed38fc8 \ No newline at end of file diff --git a/src/assets/style/fixed/vue-splitpane.scss b/src/assets/style/fixed/vue-splitpane.scss index 0202352b..9c27f3b5 100644 --- a/src/assets/style/fixed/vue-splitpane.scss +++ b/src/assets/style/fixed/vue-splitpane.scss @@ -1,6 +1,6 @@ // vue-splitpane 样式补丁 -@import '~@/assets/style/unit/_color.scss'; +@import '~@/assets/style/unit/color.scss'; .splitter-pane-resizer { background-color: $color-border-1 !important; diff --git a/src/assets/style/public.scss b/src/assets/style/public.scss index 3f369996..7e444df5 100644 --- a/src/assets/style/public.scss +++ b/src/assets/style/public.scss @@ -1,4 +1,4 @@ -@import '~@/assets/style/unit/_color.scss'; +@import '~@/assets/style/unit/color.scss'; // 工具类名统一前缀 $prefix: d2; diff --git a/src/assets/style/unit/_color.scss b/src/assets/style/unit/color.scss similarity index 100% rename from src/assets/style/unit/_color.scss rename to src/assets/style/unit/color.scss diff --git a/src/components/core/d2-icon-select/data/index.js.REMOVED.git-id b/src/components/core/d2-icon-select/data/index.js.REMOVED.git-id index dea44d69..5a614f2f 100644 --- a/src/components/core/d2-icon-select/data/index.js.REMOVED.git-id +++ b/src/components/core/d2-icon-select/data/index.js.REMOVED.git-id @@ -1 +1 @@ -822e9d488a148a997d7098a0608f482ab9f9fb7a \ No newline at end of file +3283c245146c8130af1352a64561e780a3f585c5 \ No newline at end of file diff --git a/src/components/demo/d2-page-cover/index.vue b/src/components/demo/d2-page-cover/index.vue index 1689365b..d7ca9dfe 100644 --- a/src/components/demo/d2-page-cover/index.vue +++ b/src/components/demo/d2-page-cover/index.vue @@ -5,6 +5,7 @@

{{title}}

{{subTitle}}

+ - - - - - - diff --git a/src/pages/demo/components/icon/data/index.js.REMOVED.git-id b/src/pages/demo/components/icon/data/index.js.REMOVED.git-id index dea44d69..5a614f2f 100644 --- a/src/pages/demo/components/icon/data/index.js.REMOVED.git-id +++ b/src/pages/demo/components/icon/data/index.js.REMOVED.git-id @@ -1 +1 @@ -822e9d488a148a997d7098a0608f482ab9f9fb7a \ No newline at end of file +3283c245146c8130af1352a64561e780a3f585c5 \ No newline at end of file diff --git a/src/pages/demo/element/basic-color/index.vue b/src/pages/demo/element/basic-color/index.vue index 9a8c9875..e25a1a54 100644 --- a/src/pages/demo/element/basic-color/index.vue +++ b/src/pages/demo/element/basic-color/index.vue @@ -92,7 +92,7 @@ export default { + diff --git a/src/router/routes.js.REMOVED.git-id b/src/router/routes.js.REMOVED.git-id index 6592cf19..f7873df8 100644 --- a/src/router/routes.js.REMOVED.git-id +++ b/src/router/routes.js.REMOVED.git-id @@ -1 +1 @@ -8f76893e76107fa094818a6c495320ab7023c0ab \ No newline at end of file +bf5a89a4f0f25ee326691f3c72601d638bb047cf \ No newline at end of file