From 6852f6155f4cfaee453d4c2c4665c9d9d4ccb96a Mon Sep 17 00:00:00 2001 From: liyang <1711467488@qq.com> Date: Tue, 12 Jun 2018 10:01:49 +0800 Subject: [PATCH] no message Former-commit-id: b66bab38b9ec766eb4807c6ac99311cfa7b1367e Former-commit-id: 98aa28132f7dfb1386d534cccb9b00516bbe6df1 Former-commit-id: 95ede8da9db4ce854d573c3c28a46b6d8b35ed3e Former-commit-id: f30802a28314382d7652ee1a9d6b75afd327ccf7 --- src/assets/style/public-class.scss | 52 +++++++------------ src/assets/style/public.scss | 1 - src/assets/style/theme/theme.scss | 10 ---- src/assets/style/unit/_size.scss | 1 - src/components/core/d2-container/index.vue | 4 -- src/pages/core/login/style.scss | 2 +- src/pages/demo/components/icon/select.vue | 4 +- src/pages/demo/components/layout/grid.vue | 3 -- .../mock/components/d2-demo-mock-card.vue | 2 +- 9 files changed, 23 insertions(+), 56 deletions(-) delete mode 100644 src/assets/style/unit/_size.scss diff --git a/src/assets/style/public-class.scss b/src/assets/style/public-class.scss index 33be9df6..2ac20e74 100644 --- a/src/assets/style/public-class.scss +++ b/src/assets/style/public-class.scss @@ -40,40 +40,26 @@ } // 边距相关 -.#{$prefix}-m { margin: $margin; } -.#{$prefix}-mt { margin-top: $margin; } -.#{$prefix}-mr { margin-right: $margin; } -.#{$prefix}-mb { margin-bottom: $margin; } -.#{$prefix}-ml { margin-left: $margin; } +$sizes: (0, 10, 15, 20); -.#{$prefix}-m-10 { margin: 10px; } -.#{$prefix}-mt-10 { margin-top: 10px; } -.#{$prefix}-mr-10 { margin-right: 10px; } -.#{$prefix}-mb-10 { margin-bottom: 10px; } -.#{$prefix}-ml-10 { margin-left: 10px; } +@for $index from 1 to 5 { + .#{$prefix}-m-#{nth($sizes, $index)} { margin: #{nth($sizes, $index)}px; } + .#{$prefix}-mt-#{nth($sizes, $index)} { margin-top: #{nth($sizes, $index)}px; } + .#{$prefix}-mr-#{nth($sizes, $index)} { margin-right: #{nth($sizes, $index)}px; } + .#{$prefix}-mb-#{nth($sizes, $index)} { margin-bottom: #{nth($sizes, $index)}px; } + .#{$prefix}-ml-#{nth($sizes, $index)} { margin-left: #{nth($sizes, $index)}px; } +} -.#{$prefix}-m-0 { margin: 0px; } -.#{$prefix}-mt-0 { margin-top: 0px; } -.#{$prefix}-mr-0 { margin-right: 0px; } -.#{$prefix}-mb-0 { margin-bottom: 0px; } -.#{$prefix}-ml-0 { margin-left: 0px; } +// 快速使用 +.#{$prefix}-m { margin: 20px; } +.#{$prefix}-mt { margin-top: 20px; } +.#{$prefix}-mr { margin-right: 20px; } +.#{$prefix}-mb { margin-bottom: 20px; } +.#{$prefix}-ml { margin-left: 20px; } - -.#{$prefix}-p { padding: $margin; } -.#{$prefix}-pt { padding-top: $margin; } -.#{$prefix}-pr { padding-right: $margin; } -.#{$prefix}-pb { padding-bottom: $margin; } -.#{$prefix}-pl { padding-left: $margin; } - -.#{$prefix}-p-10 { padding: 10px; } -.#{$prefix}-pt-10 { padding-top: 10px; } -.#{$prefix}-pr-10 { padding-right: 10px; } -.#{$prefix}-pb-10 { padding-bottom: 10px; } -.#{$prefix}-pl-10 { padding-left: 10px; } - -.#{$prefix}-p-0 { padding: 0px; } -.#{$prefix}-pt-0 { padding-top: 0px; } -.#{$prefix}-pr-0 { padding-right: 0px; } -.#{$prefix}-pb-0 { padding-bottom: 0px; } -.#{$prefix}-pl-0 { padding-left: 0px; } +.#{$prefix}-p { padding: 20px; } +.#{$prefix}-pt { padding-top: 20px; } +.#{$prefix}-pr { padding-right: 20px; } +.#{$prefix}-pb { padding-bottom: 20px; } +.#{$prefix}-pl { padding-left: 20px; } diff --git a/src/assets/style/public.scss b/src/assets/style/public.scss index 2fb6ad62..66aef37c 100644 --- a/src/assets/style/public.scss +++ b/src/assets/style/public.scss @@ -1,5 +1,4 @@ @import '~@/assets/style/unit/_color.scss'; -@import '~@/assets/style/unit/_size.scss'; // 工具类名统一前缀 $prefix: d2; diff --git a/src/assets/style/theme/theme.scss b/src/assets/style/theme/theme.scss index 93198426..17c418d2 100644 --- a/src/assets/style/theme/theme.scss +++ b/src/assets/style/theme/theme.scss @@ -71,16 +71,6 @@ .el-aside { transition: width .3s; overflow: inherit; - // 空菜单 - .d2-side-menu-empty { - background-color: rgba(#000, .03); - margin: $margin; - margin-top: 0px; - border-radius: 4px; - line-height: 100px; - text-align: center; - color: $color-text-sub; - } // [菜单] 正常状态 .el-menu { background-color: transparent; diff --git a/src/assets/style/unit/_size.scss b/src/assets/style/unit/_size.scss deleted file mode 100644 index c85cb481..00000000 --- a/src/assets/style/unit/_size.scss +++ /dev/null @@ -1 +0,0 @@ -$margin: 20px; \ No newline at end of file diff --git a/src/components/core/d2-container/index.vue b/src/components/core/d2-container/index.vue index 84d2eb84..832402ac 100644 --- a/src/components/core/d2-container/index.vue +++ b/src/components/core/d2-container/index.vue @@ -45,15 +45,11 @@ export default {