diff --git a/src/assets/style/fixed/base.scss b/src/assets/style/fixed/base.scss index 559bd2a1..692bb1cf 100644 --- a/src/assets/style/fixed/base.scss +++ b/src/assets/style/fixed/base.scss @@ -1,7 +1,12 @@ // 优化显示 -body { +html, body { margin: 0px; + height: 100%; + background-color: $color-bg; + #app { + height: 100%; + } } pre { diff --git a/src/assets/style/public-class.scss b/src/assets/style/public-class.scss index e9dc86b9..275e3b16 100644 --- a/src/assets/style/public-class.scss +++ b/src/assets/style/public-class.scss @@ -15,14 +15,8 @@ // 注意 这个文件里只写class // mixin等内容请在 public.scss 里书写 -html, body { - height: 100%; - background-color: $color-bg; - #app { - height: 100%; - } -} +// 浮动相关 .fl { float: left; } @@ -38,10 +32,35 @@ html, body { clear: both } -// 下边距 +// 边距相关 +.m { + margin: $margin; +} +.mt { + margin-top: $margin; +} +.mr { + margin-right: $margin; +} .mb { margin-bottom: $margin; } +.ml { + margin-left: $margin; +} + +.m-0 { + margin: 0px; +} +.mt-0 { + margin-top: 0px; +} +.mr-0 { + margin-right: 0px; +} .mb-0 { margin-bottom: 0px; } +.ml-0 { + margin-left: 0px; +} diff --git a/src/pages/demo/plugins/vue-grid-layout/readme.vue b/src/pages/demo/plugins/vue-grid-layout/readme.vue deleted file mode 100644 index 7e47dfb3..00000000 --- a/src/pages/demo/plugins/vue-grid-layout/readme.vue +++ /dev/null @@ -1,10 +0,0 @@ - \ No newline at end of file diff --git a/src/router/menu/_plugin.js b/src/router/menu/_plugin.js index 66ec4181..d2e692df 100644 --- a/src/router/menu/_plugin.js +++ b/src/router/menu/_plugin.js @@ -76,13 +76,6 @@ export const pluginMenu = { title: '网格布局', icon: 'object-ungroup', children: [ - { - title: 'README', - icon: 'file-text', - path: 'vue-grid-layout/readme', - name: 'demo-plugin-vue-grid-layout-readme', - component: resolve => { require(['@/pages/demo/plugins/vue-grid-layout/readme.vue'], resolve) } - }, { title: '基本示例', icon: 'file-o',