From 3585e9eb78ab45a8e46ef32f3354094bbf2b282f Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Mon, 2 Jul 2018 08:22:28 +0800
Subject: [PATCH] no message
Former-commit-id: 21c2eb17a98a8670e50e3c5a01992400b81770e9 [formerly 21c2eb17a98a8670e50e3c5a01992400b81770e9 [formerly 21c2eb17a98a8670e50e3c5a01992400b81770e9 [formerly 21c2eb17a98a8670e50e3c5a01992400b81770e9 [formerly dea08899083aa05e8d6f14614c025b48b97741e6 [formerly 1ce2023c82a4fcd9627e210eb274c69219fd7425]]]]]
Former-commit-id: 940e1f2395a642c9af922dab82dc23bac003f17f
Former-commit-id: 99acadc56e19d94f968c0d8e63a4b25dddde8c3b
Former-commit-id: 21cecee25d507ce21b21c9cbbfc811c8257cfb0d [formerly d218edea00350bf5c15b8c72263474467eea3e56]
Former-commit-id: 7d5e734f081616be0d3b49e7dcb460a9f38c9e11
Former-commit-id: 3b94c9ce56c268eb3b1866883f1c7805673f25b9
Former-commit-id: 642c47e68190eff32090d358c65df31f40854a3c
Former-commit-id: 36eb24536167392823e080fae3d21dde6f9d318c
Former-commit-id: a87d518565feff320f9f4de7b19d3165a5a3c51d
---
docs/zh/components/container.md | 4 +-
src/assets/style/theme/theme.scss | 10 +-
src/pages/demo/components/container/ghost.vue | 2 +-
.../demo/components/container/md/doc-ghost.md | 6 +-
src/pages/demo/element/basic-color/index.vue | 164 +++++++-------
src/pages/demo/element/basic-layout/index.vue | 206 +++++++++---------
.../demo/element/basic-typography/index.vue | 102 ++++-----
7 files changed, 241 insertions(+), 253 deletions(-)
diff --git a/docs/zh/components/container.md b/docs/zh/components/container.md
index 95731ba3..27cfc424 100644
--- a/docs/zh/components/container.md
+++ b/docs/zh/components/container.md
@@ -85,10 +85,12 @@ export default {
### 隐形页面容器
-不显示任何背景色和边框
+不显示任何背景色和边框，通常这个模式只有在极少情况下会使用
``` vue
主体内容
```
+
+如果你不希望内容紧贴上边，可以在内容外层容器设置 `class="d2-mt"`
diff --git a/src/assets/style/theme/theme.scss b/src/assets/style/theme/theme.scss
index 0ae8ba93..c09a7e93 100644
--- a/src/assets/style/theme/theme.scss
+++ b/src/assets/style/theme/theme.scss
@@ -249,7 +249,8 @@
.d2-theme-container-main-body {
// 布局组件
.container-component {
- // [组件] d2-container-full
+ // [组件]
+ // d2-container-full 填充型
.d2-container-full {
border: $theme-container-border-outer;
border-top: none;
@@ -266,16 +267,17 @@
background: $theme-container-header-footer-background-color;
}
}
- // [组件] d2-container-card
+ // [组件]
+ // d2-container-card 卡片型
.d2-container-card {
border: $theme-container-border-outer;
border-top: none;
background: transparent;
- .el-card__header {
+ &>.el-card__header {
border-bottom: $theme-container-border-inner;
background: $theme-container-header-footer-background-color;
}
- .el-card__body {
+ &>.el-card__body {
background: $theme-container-background-color;
}
}
diff --git a/src/pages/demo/components/container/ghost.vue b/src/pages/demo/components/container/ghost.vue
index cb58c0cb..7a19241d 100644
--- a/src/pages/demo/components/container/ghost.vue
+++ b/src/pages/demo/components/container/ghost.vue
@@ -1,6 +1,6 @@
-
+
diff --git a/src/pages/demo/components/container/md/doc-ghost.md b/src/pages/demo/components/container/md/doc-ghost.md
index 9a5ab565..af284fb9 100644
--- a/src/pages/demo/components/container/md/doc-ghost.md
+++ b/src/pages/demo/components/container/md/doc-ghost.md
@@ -1,9 +1,11 @@
## 隐形页面容器
-不显示任何背景色和边框
+不显示任何背景色和边框，通常这个模式只有在极少情况下会使用
```
主体内容
-```
\ No newline at end of file
+```
+
+如果你不希望内容紧贴上边，可以在内容外层容器设置 `class="d2-mt"`
\ 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 15883b83..3a73aa22 100644
--- a/src/pages/demo/element/basic-color/index.vue
+++ b/src/pages/demo/element/basic-color/index.vue
@@ -1,90 +1,84 @@
-
+
-
- 主色
-
-
-
-
-
-
-
-
-
-
- 辅助色
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 中性色
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ 主色
+
+
+
+
+
+
+
+
+ 辅助色
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 中性色
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/demo/element/basic-layout/index.vue b/src/pages/demo/element/basic-layout/index.vue
index 262f4022..e3912336 100644
--- a/src/pages/demo/element/basic-layout/index.vue
+++ b/src/pages/demo/element/basic-layout/index.vue
@@ -1,118 +1,106 @@
-
+
+
+ 基础布局
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
- 基础布局
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ 分栏间隔
+
+
+
+
+
+
-
- 分栏间隔
-
-
-
-
-
-
-
+ 混合布局
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
- 混合布局
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ 分栏偏移
+
+
+
+
+
+
+
+
+
+
+
-
- 分栏偏移
-
-
-
-
-
-
-
-
-
-
-
-
+ 对齐方式
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
- 对齐方式
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 响应式布局
-
-
-
-
-
-
-
+ 响应式布局
+
+
+
+
+
+
diff --git a/src/pages/demo/element/basic-typography/index.vue b/src/pages/demo/element/basic-typography/index.vue
index 8632c179..6e5318af 100644
--- a/src/pages/demo/element/basic-typography/index.vue
+++ b/src/pages/demo/element/basic-typography/index.vue
@@ -1,55 +1,55 @@
-
-
- 中文字体
-
-
-
- PingFang SC
- 和畅惠风
-
-
-
-
- Hiragino Sans GB
- 和畅惠风
-
-
-
-
- Microsoft YaHei
- 和畅惠风
-
-
-
-
-
- 英文／数字字体
-
-
-
- Helvetica Neue
- RGag
-
-
-
-
- Helvetica
- RGag
-
-
-
-
- Arial
- RGag
-
-
-
-
-
- Font-family 代码
-
-
+
+
+ 字体
+
+ 中文字体
+
+
+
+ PingFang SC
+ 和畅惠风
+
+
+
+
+ Hiragino Sans GB
+ 和畅惠风
+
+
+
+
+ Microsoft YaHei
+ 和畅惠风
+
+
+
+
+ 英文／数字字体
+
+
+
+ Helvetica Neue
+ RGag
+
+
+
+
+ Helvetica
+ RGag
+
+
+
+
+ Arial
+ RGag
+
+
+
+
+ Font-family 代码
+
+