diff --git a/template/admin/src/components/main/components/tags-nav/tags-nav.less b/template/admin/src/components/main/components/tags-nav/tags-nav.less index 699b95aa7..3ddb61f57 100644 --- a/template/admin/src/components/main/components/tags-nav/tags-nav.less +++ b/template/admin/src/components/main/components/tags-nav/tags-nav.less @@ -11,14 +11,12 @@ height: 100%; } .tag-nav-wrapper { - // height: 10px; background: unset; width: 100%; - margin: 0 15px 0 0px; + margin: 0px; //overflow: hidden; padding: 0; height: 42px; - margin-bottom: 14px; background-color: #fff; box-shadow: 0px 2px 4px 0px rgba(0, 0, 0, 0.06); z-index: 8; diff --git a/template/admin/src/components/main/main.vue b/template/admin/src/components/main/main.vue index 3630513bd..f1221ab26 100644 --- a/template/admin/src/components/main/main.vue +++ b/template/admin/src/components/main/main.vue @@ -303,7 +303,7 @@ export default { } } .main-warper { - min-height: calc(~'100vh - 166px'); + min-height: calc(~'100vh - 196px'); } .all-desk { height: 100vh !important; @@ -314,8 +314,5 @@ export default { .content-wrapper { height: 100vh !important; } - .content-wrapper { - padding: 0; - } } diff --git a/template/admin/src/styles/style.css b/template/admin/src/styles/style.css index d20276008..fb6026891 100644 --- a/template/admin/src/styles/style.css +++ b/template/admin/src/styles/style.css @@ -537,7 +537,10 @@ body { font-size: 20px; } .main .content-wrapper { - padding-top: 0; + padding: 16px; + height: calc(100% - 80px); + overflow: auto; + background-color: #f5f7f9; } .left-wrapper{ height: calc(100vh - 120px);