sheng/mes-ui-d2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

no message

Browse Source 
Former-commit-id: 5b298dfee66105a27662fcc28093e262f6fd6b88 [formerly 5b298dfee66105a27662fcc28093e262f6fd6b88 [formerly 5b298dfee66105a27662fcc28093e262f6fd6b88 [formerly 5b298dfee66105a27662fcc28093e262f6fd6b88 [formerly 1eac930ecafafcd4bc3a3f863777e7ca08e94bd0 [formerly 9451c81818c835ec44069e292d80deebbc3ccc08]]]]]
Former-commit-id: 6475c3dc7d71b833dabb73f1c6b47984e544b3b5
Former-commit-id: ed430fd6ccac7ebb4aacad1ebe4e6c99a427eb13
Former-commit-id: f36a435fec0eec783e5b76d18c0e217fc74345f7 [formerly 4cdb1c1b9efff274953ade88a98fe6008e7a1797]
Former-commit-id: 90dea42f9c31d6d3348f451b62f578b3ac0dbbab
Former-commit-id: 16cf6481273530911c552082c6cca18672e7033b
Former-commit-id: 194b973addbb9b37b11a8d079e4ef1e928637da5
Former-commit-id: f115af20538dc239535cad43b2e2d977b849844a
Former-commit-id: 884f97a7d2524a3d4618149d02e2992b35002629
This commit is contained in:
liyang
2018-06-24 22:43:11 +08:00
parent e5816b6662
commit 2112ed1faf
5 changed files with 39 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/assets/style/public-class.scss
View File

@@ -43,29 +43,29 @@
$sizes: (0, 10, 15, 20);
@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-#{nth($sizes, $index)} { margin: #{nth($sizes, $index)}px !important; }
.#{$prefix}-mt-#{nth($sizes, $index)} { margin-top: #{nth($sizes, $index)}px !important; }
.#{$prefix}-mr-#{nth($sizes, $index)} { margin-right: #{nth($sizes, $index)}px !important; }
.#{$prefix}-mb-#{nth($sizes, $index)} { margin-bottom: #{nth($sizes, $index)}px !important; }
.#{$prefix}-ml-#{nth($sizes, $index)} { margin-left: #{nth($sizes, $index)}px !important; }
.#{$prefix}-p-#{nth($sizes, $index)} { padding: #{nth($sizes, $index)}px; }
.#{$prefix}-pt-#{nth($sizes, $index)} { padding-top: #{nth($sizes, $index)}px; }
.#{$prefix}-pr-#{nth($sizes, $index)} { padding-right: #{nth($sizes, $index)}px; }
.#{$prefix}-pb-#{nth($sizes, $index)} { padding-bottom: #{nth($sizes, $index)}px; }
.#{$prefix}-pl-#{nth($sizes, $index)} { padding-left: #{nth($sizes, $index)}px; }
.#{$prefix}-p-#{nth($sizes, $index)} { padding: #{nth($sizes, $index)}px !important; }
.#{$prefix}-pt-#{nth($sizes, $index)} { padding-top: #{nth($sizes, $index)}px !important; }
.#{$prefix}-pr-#{nth($sizes, $index)} { padding-right: #{nth($sizes, $index)}px !important; }
.#{$prefix}-pb-#{nth($sizes, $index)} { padding-bottom: #{nth($sizes, $index)}px !important; }
.#{$prefix}-pl-#{nth($sizes, $index)} { padding-left: #{nth($sizes, $index)}px !important; }
}
// 快速使用
.#{$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}-m { margin: 20px !important; }
.#{$prefix}-mt { margin-top: 20px !important; }
.#{$prefix}-mr { margin-right: 20px !important; }
.#{$prefix}-mb { margin-bottom: 20px !important; }
.#{$prefix}-ml { margin-left: 20px !important; }
.#{$prefix}-p { padding: 20px; }
.#{$prefix}-pt { padding-top: 20px; }
.#{$prefix}-pr { padding-right: 20px; }
.#{$prefix}-pb { padding-bottom: 20px; }
.#{$prefix}-pl { padding-left: 20px; }
.#{$prefix}-p { padding: 20px !important; }
.#{$prefix}-pt { padding-top: 20px !important; }
.#{$prefix}-pr { padding-right: 20px !important; }
.#{$prefix}-pb { padding-bottom: 20px !important; }
.#{$prefix}-pl { padding-left: 20px !important; }

4
src/components/core/d2-layout-main/components/-help/index.vue
View File

@@ -11,11 +11,11 @@
<el-row :gutter="20">
<el-col :span="12">
<el-alert :closable="false" type="info" title="扫码进 QQ 群" class="d2-mb"/>
<img class="qr" :src="`${$assetsPublicPath}/static/image/me/qq.jpg`">
<img class="qr" :src="`${$assetsPublicPath}static/image/me/qq.jpg`">
</el-col>
<el-col :span="12">
<el-alert :closable="false" type="info" title="作者微信 加好友拉进微信群" class="d2-mb"/>
<img class="qr" :src="`${$assetsPublicPath}/static/image/me/we.jpg`">
<img class="qr" :src="`${$assetsPublicPath}static/image/me/we.jpg`">
</el-col>
</el-row>
</div>

6
src/components/core/d2-layout-main/components/-menu-side/index.vue
View File

@@ -1,6 +1,6 @@
<template>
<div style="height: 100%;">
<el-scrollbar>
<el-scrollbar v-if="menus.length > 0 && !collapse">
<div :style="{ height: `${asideHeight}px` }">
<el-menu
:collapse="collapse"
@@ -56,10 +56,14 @@ export default {
},
mounted () {
this.updateAsideHeight()
window.onresize = () => {
this.updateAsideHeight()
}
},
methods: {
updateAsideHeight () {
this.asideHeight = this.$el.offsetHeight
console.log(this.asideHeight)
}
}
}