Merge branch 'master' into permission-control

2019-05-08 18:12:14 +08:00 · 2019-05-08 18:12:14 +08:00 · 49645aef79
parent 27d06dd662 9793fff12d
commit 49645aef79
1 changed files with 9 additions and 2 deletions
--- a/src/layout/components/AppMain.vue
+++ b/src/layout/components/AppMain.vue
@ -27,7 +27,14 @@ export default {
 }
 .fixed-header+.app-main {
  padding-top: 50px;
-  height: 100vh;
-  overflow: auto;
+}
+</style>
+
+<style lang="scss">
+// fix css style bug in open el-dialog
+.el-popup-parent--hidden {
+  .fixed-header {
+    padding-right: 15px;
+  }
 }
 </style>