no message

Former-commit-id: b66bab38b9ec766eb4807c6ac99311cfa7b1367e
Former-commit-id: 98aa28132f7dfb1386d534cccb9b00516bbe6df1
Former-commit-id: 95ede8da9db4ce854d573c3c28a46b6d8b35ed3e
Former-commit-id: f30802a28314382d7652ee1a9d6b75afd327ccf7
This commit is contained in:
liyang
2018-06-12 10:01:49 +08:00
parent 1386d61cee
commit 6852f6155f
9 changed files with 23 additions and 56 deletions

View File

@@ -40,40 +40,26 @@
} }
// 边距相关 // 边距相关
.#{$prefix}-m { margin: $margin; } $sizes: (0, 10, 15, 20);
.#{$prefix}-mt { margin-top: $margin; }
.#{$prefix}-mr { margin-right: $margin; }
.#{$prefix}-mb { margin-bottom: $margin; }
.#{$prefix}-ml { margin-left: $margin; }
.#{$prefix}-m-10 { margin: 10px; } @for $index from 1 to 5 {
.#{$prefix}-mt-10 { margin-top: 10px; } .#{$prefix}-m-#{nth($sizes, $index)} { margin: #{nth($sizes, $index)}px; }
.#{$prefix}-mr-10 { margin-right: 10px; } .#{$prefix}-mt-#{nth($sizes, $index)} { margin-top: #{nth($sizes, $index)}px; }
.#{$prefix}-mb-10 { margin-bottom: 10px; } .#{$prefix}-mr-#{nth($sizes, $index)} { margin-right: #{nth($sizes, $index)}px; }
.#{$prefix}-ml-10 { margin-left: 10px; } .#{$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: 20px; }
.#{$prefix}-p { padding: $margin; } .#{$prefix}-pt { padding-top: 20px; }
.#{$prefix}-pt { padding-top: $margin; } .#{$prefix}-pr { padding-right: 20px; }
.#{$prefix}-pr { padding-right: $margin; } .#{$prefix}-pb { padding-bottom: 20px; }
.#{$prefix}-pb { padding-bottom: $margin; } .#{$prefix}-pl { padding-left: 20px; }
.#{$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; }

View File

@@ -1,5 +1,4 @@
@import '~@/assets/style/unit/_color.scss'; @import '~@/assets/style/unit/_color.scss';
@import '~@/assets/style/unit/_size.scss';
// 工具类名统一前缀 // 工具类名统一前缀
$prefix: d2; $prefix: d2;

View File

@@ -71,16 +71,6 @@
.el-aside { .el-aside {
transition: width .3s; transition: width .3s;
overflow: inherit; 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 { .el-menu {
background-color: transparent; background-color: transparent;

View File

@@ -1 +0,0 @@
$margin: 20px;

View File

@@ -45,15 +45,11 @@ export default {
<style lang="scss"> <style lang="scss">
@import '~@/assets/style/public.scss'; @import '~@/assets/style/public.scss';
.container-component { .container-component {
// margin-right: 20px;
// margin-bottom: 20px;
position: absolute; position: absolute;
top: 0px; top: 0px;
bottom: 0px; bottom: 0px;
left: 0px; left: 0px;
right: 0px; right: 0px;
// padding-right: $margin;
// padding-bottom: $margin;
overflow: auto; overflow: auto;
} }
@media (min-width: 576px) { @media (min-width: 576px) {

View File

@@ -61,6 +61,6 @@
// 帮助按钮 // 帮助按钮
.button-help { .button-help {
width: 300px; width: 300px;
margin-top: $margin; margin-top: 20px;
} }
} }

View File

@@ -40,8 +40,8 @@ export default {
<style lang="scss" scoped> <style lang="scss" scoped>
@import '~@/assets/style/public.scss'; @import '~@/assets/style/public.scss';
.title-group { .title-group {
margin-top: $margin; margin-top: 20px;
margin-bottom: $margin / 2; margin-bottom: 10px;
&:first-child { &:first-child {
margin-top: 0px; margin-top: 0px;
} }

View File

@@ -94,9 +94,6 @@ export default {
.el-card { .el-card {
height: 100%; height: 100%;
@extend %unable-select; @extend %unable-select;
// .el-card__header {
// padding: 8px $margin;
// }
} }
.vue-resizable-handle { .vue-resizable-handle {
opacity: .3; opacity: .3;

View File

@@ -47,7 +47,7 @@ export default {
<style lang="scss" scoped> <style lang="scss" scoped>
@import '~@/assets/style/public.scss'; @import '~@/assets/style/public.scss';
.col { .col {
padding: $margin; padding: 20px;
border-radius: 4px; border-radius: 4px;
border-width: 1px; border-width: 1px;
border-style: solid; border-style: solid;