diff --git a/vue/src/assets/styles/index.scss b/vue/src/assets/styles/index.scss index b892a2b..cafe0ad 100644 --- a/vue/src/assets/styles/index.scss +++ b/vue/src/assets/styles/index.scss @@ -84,16 +84,16 @@ a:hover { } .max-view-height { - height: calc(100vh - #{$pageViewMargin * 2}); + height: calc(100vh - #{$page-view-margin * 2}); } .has-header { .max-view-height { - height: calc(100vh - #{$navHeight} - #{$pageViewMargin * 2}); + height: calc(100vh - #{$nav-height} - #{$page-view-margin * 2}); } &.has-tags-view .max-view-height { - height: calc(100vh - #{$navHeight} - #{$tagsViewHeight} - #{$pageViewMargin * 2}); + height: calc(100vh - #{$nav-height} - #{$tags-view-height} - #{$page-view-margin * 2}); } } diff --git a/vue/src/assets/styles/variables.scss b/vue/src/assets/styles/variables.scss index f1d9bc4..11a591e 100644 --- a/vue/src/assets/styles/variables.scss +++ b/vue/src/assets/styles/variables.scss @@ -47,12 +47,12 @@ $sub-menu-hover: #001528; //侧边栏宽度 $side-bar-width: 210px; //头部导航栏高度 -$navHeight: 50px; +$nav-height: 50px; //头部多页签栏高度 -$tagsViewHeight: 40px; +$tags-view-height: 40px; //路由页面的margin -$pageViewMargin: 15px; +$page-view-margin: 15px; //引入element的scss时需要覆盖字体路径 $--font-path: '~element-ui/lib/theme-chalk/fonts'; diff --git a/vue/src/components/RegionSelector/index.vue b/vue/src/components/RegionSelector/index.vue index 4b558bb..bb4cfcf 100644 --- a/vue/src/components/RegionSelector/index.vue +++ b/vue/src/components/RegionSelector/index.vue @@ -1,6 +1,6 @@ + + diff --git a/vue/src/components/Skeleton/index.vue b/vue/src/components/Skeleton/index.vue index aa6af53..64f3a99 100644 --- a/vue/src/components/Skeleton/index.vue +++ b/vue/src/components/Skeleton/index.vue @@ -44,4 +44,4 @@ } - + diff --git a/vue/src/components/Skeleton/QSkeleton.scss b/vue/src/components/Skeleton/style.scss similarity index 100% rename from vue/src/components/Skeleton/QSkeleton.scss rename to vue/src/components/Skeleton/style.scss diff --git a/vue/src/layout/components/Header.vue b/vue/src/layout/components/Header.vue index f76dfae..a35e5ee 100644 --- a/vue/src/layout/components/Header.vue +++ b/vue/src/layout/components/Header.vue @@ -69,12 +69,12 @@