diff --git a/vue-admin-wonderful-next/src/theme/app.scss b/vue-admin-wonderful-next/src/theme/app.scss index 35d44d9..7cc7c12 100644 --- a/vue-admin-wonderful-next/src/theme/app.scss +++ b/vue-admin-wonderful-next/src/theme/app.scss @@ -47,8 +47,7 @@ body, @extend .el-scrollbar; padding: 15px; } - .el-scrollbar__view { - height: 100%; + .layout-container-header-main { display: flex; flex-direction: column; } @@ -62,6 +61,15 @@ body, .h100 { height: 100% !important; } +.vh100 { + height: 100vh !important; +} +.max100vh { + max-height: 100vh !important; +} +.min100vh { + min-height: 100vh !important; +} /* 字体大小全局样式 ------------------------------- */ diff --git a/vue-admin-wonderful-next/src/theme/common/transition.scss b/vue-admin-wonderful-next/src/theme/common/transition.scss index c62dba7..891d5a7 100644 --- a/vue-admin-wonderful-next/src/theme/common/transition.scss +++ b/vue-admin-wonderful-next/src/theme/common/transition.scss @@ -27,7 +27,7 @@ ------------------------------- */ .breadcrumb-enter-active, .breadcrumb-leave-active { - transition: all 0.3s ease; + transition: all 0.2s ease; position: absolute; } .breadcrumb-enter-from, diff --git a/vue-admin-wonderful-next/src/theme/media/index.scss b/vue-admin-wonderful-next/src/theme/media/index.scss index 320affb..0f2758d 100644 --- a/vue-admin-wonderful-next/src/theme/media/index.scss +++ b/vue-admin-wonderful-next/src/theme/media/index.scss @@ -10,3 +10,28 @@ $sm: 768px; $md: 992px; $lg: 1200px; $xl: 1920px; + +/* 页面宽度小于576px +------------------------------- */ +@media screen and (max-width: $xs) { +} + +/* 页面宽度小于768px +------------------------------- */ +@media screen and (max-width: $sm) { +} + +/* 页面宽度大于768px小于992px +------------------------------- */ +@media screen and (min-width: $sm) and (max-width: $md) { +} + +/* 页面宽度大于992px小于1200px +------------------------------- */ +@media screen and (min-width: $md) and (max-width: $lg) { +} + +/* 页面宽度大于1920px +------------------------------- */ +@media screen and (min-width: $xl) { +} diff --git a/vue-admin-wonderful-next/src/theme/media/template.scss b/vue-admin-wonderful-next/src/theme/media/template.scss deleted file mode 100644 index 492737b..0000000 --- a/vue-admin-wonderful-next/src/theme/media/template.scss +++ /dev/null @@ -1,26 +0,0 @@ -@import './index.scss'; - -/* 页面宽度小于576px -------------------------------- */ -@media screen and (max-width: $xs) { -} - -/* 页面宽度小于768px -------------------------------- */ -@media screen and (max-width: $sm) { -} - -/* 页面宽度大于768px小于992px -------------------------------- */ -@media screen and (min-width: $sm) and (max-width: $md) { -} - -/* 页面宽度大于992px小于1200px -------------------------------- */ -@media screen and (min-width: $md) and (max-width: $lg) { -} - -/* 页面宽度大于1920px -------------------------------- */ -@media screen and (min-width: $xl) { -} diff --git a/vue-admin-wonderful-next/src/views/layout/component/main.vue b/vue-admin-wonderful-next/src/views/layout/component/main.vue index 9993bb3..4298ec8 100644 --- a/vue-admin-wonderful-next/src/views/layout/component/main.vue +++ b/vue-admin-wonderful-next/src/views/layout/component/main.vue @@ -1,6 +1,6 @@