From 04de4950fcb2052e64b72d049adac916f966207b Mon Sep 17 00:00:00 2001 From: liyang <1711467488@qq.com> Date: Sun, 22 Jul 2018 17:25:34 +0800 Subject: [PATCH] =?UTF-8?q?.d2-card=20=E6=A0=B7=E5=BC=8F=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Former-commit-id: ebc32c296fb4536eca420e3c807a7fd7503a4f65 [formerly ebc32c296fb4536eca420e3c807a7fd7503a4f65 [formerly ebc32c296fb4536eca420e3c807a7fd7503a4f65 [formerly ebc32c296fb4536eca420e3c807a7fd7503a4f65 [formerly 7fdb616f73e2c36514f5138cb5bd8609159b2829 [formerly 81e8458c903cca7218568efd8bb7cfe0ec27c2cc]]]]] Former-commit-id: d4ef6e0b6868352cf932ef40dba76f3558ddee6e Former-commit-id: d60ca041eddfcf2eeb2c1cd9f251d25345add56f Former-commit-id: 17e6d5fdb1436edf1ea269f32928c71682d00388 [formerly 1389028c3944a71da4eae8d3c730f99281280458] Former-commit-id: 5b458e307c8ff34109ecaa836bb5828f59c1e36c Former-commit-id: 838bc54e76eb119c2ac8dfc6aa4718d27d1e4984 Former-commit-id: bf2e0c07a945515850109240acc44d946799f21b Former-commit-id: 7db1e253cbecc6195d80c95bd6dc614bf8b971d1 Former-commit-id: 39250e6a78db400e372f06523e084876b4e8307f --- docs/zh/components/container.md | 2 +- docs/zh/others/css.md | 12 +++ .../theme/theme-base.scss.REMOVED.git-id | 2 +- .../style/theme/theme.scss.REMOVED.git-id | 2 +- src/menu/modules/demo-playground.js | 1 + src/menu/modules/demo-plugins.js | 1 - .../demo/components/container/ghost-bs.vue | 2 +- .../demo/components/container/ghost-slot.vue | 2 +- src/pages/demo/components/container/ghost.vue | 2 +- src/pages/demo/components/countup/index.vue | 12 +-- .../demo/components/editor-quill/index.vue | 2 +- .../components/editor-simpleMDE/index.vue | 2 +- src/pages/demo/components/highlight/index.vue | 8 +- src/pages/demo/components/layout/grid.vue | 2 +- .../demo/element/basic-typography/index.vue | 12 +-- src/pages/demo/element/data-table/index.vue | 45 ++++++----- src/pages/demo/playground/env/index.vue | 9 +++ src/pages/demo/plugins/build/index.vue | 6 -- src/pages/demo/plugins/day/index.vue | 76 +++++++++---------- .../mock/components/d2-demo-mock-card.vue | 2 +- src/router/routes.js.REMOVED.git-id | 2 +- 21 files changed, 112 insertions(+), 92 deletions(-) create mode 100644 src/pages/demo/playground/env/index.vue delete mode 100644 src/pages/demo/plugins/build/index.vue diff --git a/docs/zh/components/container.md b/docs/zh/components/container.md index 974583fe..36583a16 100644 --- a/docs/zh/components/container.md +++ b/docs/zh/components/container.md @@ -277,7 +277,7 @@ ghost 模式适合对页面有定制需求的用户,此模式生成一个没 ## 注 -本文插图为 [@FairyEver](https://github.com/FairyEver) 为此文档设计,未经授权不得转载或者修改使用 +本文插图为 [@FairyEver](https://github.com/FairyEver) 专为此文档设计,未经授权不得转载或者修改使用 ![](http://fairyever.qiniudn.com/2018-07-22-Snip20180722_2.png) diff --git a/docs/zh/others/css.md b/docs/zh/others/css.md index fa9feac5..8e5ff929 100644 --- a/docs/zh/others/css.md +++ b/docs/zh/others/css.md @@ -1,5 +1,17 @@ # CSS 工具类 +## 样式 + +| 类名 | 效果 | +| --- | --- | +| `.d2-card` | 将该 class 添加至 el-card 组件上使其有跟随主题变化的样式 | + +`.d2-card` 示例 + +``` vue + +``` + ## 文字 | 类名 | 效果 | diff --git a/src/assets/style/theme/theme-base.scss.REMOVED.git-id b/src/assets/style/theme/theme-base.scss.REMOVED.git-id index 576c2be6..e05e9018 100644 --- a/src/assets/style/theme/theme-base.scss.REMOVED.git-id +++ b/src/assets/style/theme/theme-base.scss.REMOVED.git-id @@ -1 +1 @@ -ae3bb618b4174f42e284453d1cd623e5f076862a \ No newline at end of file +e8bc36218d0778ed548d888e1fdf30405ccd2da4 \ No newline at end of file diff --git a/src/assets/style/theme/theme.scss.REMOVED.git-id b/src/assets/style/theme/theme.scss.REMOVED.git-id index 09862328..1f2b5ba2 100644 --- a/src/assets/style/theme/theme.scss.REMOVED.git-id +++ b/src/assets/style/theme/theme.scss.REMOVED.git-id @@ -1 +1 @@ -6113c4d47cf82202af858d0e14f7bd7bab4b4500 \ No newline at end of file +d7807eecc7082d138c70f222eb3834c6ad63c366 \ No newline at end of file diff --git a/src/menu/modules/demo-playground.js b/src/menu/modules/demo-playground.js index 328e0540..9c1d6497 100644 --- a/src/menu/modules/demo-playground.js +++ b/src/menu/modules/demo-playground.js @@ -26,6 +26,7 @@ export default { { path: `${pre}fullscreen`, title: '全屏', icon: 'arrows-alt' }, { path: `${pre}gray`, title: '灰度模式', icon: 'eye' }, { path: `${pre}db`, title: '数据持久化', icon: 'database' }, + { path: `${pre}env`, title: '环境信息', icon: 'microchip' }, { path: `${pre}ua`, title: '浏览器信息', icon: 'info-circle' } ])('/demo/playground/') } diff --git a/src/menu/modules/demo-plugins.js b/src/menu/modules/demo-plugins.js index 848cddaf..22105b1f 100644 --- a/src/menu/modules/demo-plugins.js +++ b/src/menu/modules/demo-plugins.js @@ -50,7 +50,6 @@ export default { { path: `${pre}better-scroll/to`, title: '滚动定位' } ] }, - { path: `${pre}build`, title: '环境区分', icon: 'database' }, { path: `${pre}clipboard-polyfill`, title: '剪贴板访问', icon: 'clipboard' }, { path: `${pre}day`, title: '日期计算', icon: 'clock-o' }, { path: `${pre}js-cookie`, title: 'Cookie 读写', icon: 'asterisk' } diff --git a/src/pages/demo/components/container/ghost-bs.vue b/src/pages/demo/components/container/ghost-bs.vue index fa3179d0..36c25b06 100644 --- a/src/pages/demo/components/container/ghost-bs.vue +++ b/src/pages/demo/components/container/ghost-bs.vue @@ -2,7 +2,7 @@
- +
diff --git a/src/pages/demo/components/container/ghost-slot.vue b/src/pages/demo/components/container/ghost-slot.vue index 5a8430d2..831594da 100644 --- a/src/pages/demo/components/container/ghost-slot.vue +++ b/src/pages/demo/components/container/ghost-slot.vue @@ -2,7 +2,7 @@
- +
diff --git a/src/pages/demo/components/container/ghost.vue b/src/pages/demo/components/container/ghost.vue index 651ee9c5..2c9872c3 100644 --- a/src/pages/demo/components/container/ghost.vue +++ b/src/pages/demo/components/container/ghost.vue @@ -1,7 +1,7 @@