From e319fc9bb47fedced910592e742237559eb76f62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E6=9D=A8?= <1711467488@qq.com> Date: Wed, 17 Jan 2018 10:31:40 +0800 Subject: [PATCH] no message Former-commit-id: ce77dc28f382b299e8438c0c587b144f72c82f25 Former-commit-id: a86fa80ced727731284ce5f8b369f2937c5ea874 Former-commit-id: 6ac913215b2f6add109219529735edb6afd4e34e --- src/assets/style/public-class.scss | 80 ++++++++----------- src/pages/demo/plugins/font-awesome/index.vue | 4 +- 2 files changed, 37 insertions(+), 47 deletions(-) diff --git a/src/assets/style/public-class.scss b/src/assets/style/public-class.scss index cdda828e..498967a8 100644 --- a/src/assets/style/public-class.scss +++ b/src/assets/style/public-class.scss @@ -37,50 +37,40 @@ } // 边距相关 -.#{$prefix}-m { - margin: $margin; -} -.#{$prefix}-mt { - margin-top: $margin; -} -.#{$prefix}-mr { - margin-right: $margin; -} -.#{$prefix}-mb { - margin-bottom: $margin; -} -.#{$prefix}-ml { - margin-left: $margin; -} +.#{$prefix}-m { margin: $margin; } +.#{$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; -} -.#{$prefix}-mt-10 { - margin-top: 10px; -} -.#{$prefix}-mr-10 { - margin-right: 10px; -} -.#{$prefix}-mb-10 { - margin-bottom: 10px; -} -.#{$prefix}-ml-10 { - margin-left: 10px; -} +.#{$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; } -.#{$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-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}-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; } diff --git a/src/pages/demo/plugins/font-awesome/index.vue b/src/pages/demo/plugins/font-awesome/index.vue index 80407f37..74b59304 100644 --- a/src/pages/demo/plugins/font-awesome/index.vue +++ b/src/pages/demo/plugins/font-awesome/index.vue @@ -6,8 +6,8 @@ + :span="6" + class="dd-p-10">