diff --git a/template/admin/src/components/main/components/header-bar/custom-bread-crumb/custom-bread-crumb.less b/template/admin/src/components/main/components/header-bar/custom-bread-crumb/custom-bread-crumb.less index 76102a988..80c504bf5 100644 --- a/template/admin/src/components/main/components/header-bar/custom-bread-crumb/custom-bread-crumb.less +++ b/template/admin/src/components/main/components/header-bar/custom-bread-crumb/custom-bread-crumb.less @@ -1,4 +1,5 @@ .custom-bread-crumb { display: inline-block; vertical-align: top; + color: #fff; } diff --git a/template/admin/src/components/main/components/header-bar/header-bar.less b/template/admin/src/components/main/components/header-bar/header-bar.less index 89c72e0c9..4997ed025 100644 --- a/template/admin/src/components/main/components/header-bar/header-bar.less +++ b/template/admin/src/components/main/components/header-bar/header-bar.less @@ -2,6 +2,7 @@ width: 100%; height: 100%; position: relative; + color: #fff !important; .custom-content-con { float: right; height: auto; diff --git a/template/admin/src/components/main/components/header-bar/header-bar.vue b/template/admin/src/components/main/components/header-bar/header-bar.vue index 127129070..5d83c1d24 100644 --- a/template/admin/src/components/main/components/header-bar/header-bar.vue +++ b/template/admin/src/components/main/components/header-bar/header-bar.vue @@ -2,15 +2,15 @@
- + - + > -->
@@ -18,7 +18,6 @@ diff --git a/template/admin/src/components/main/main.less b/template/admin/src/components/main/main.less index e70aa2b01..f5bc4e99c 100644 --- a/template/admin/src/components/main/main.less +++ b/template/admin/src/components/main/main.less @@ -1,7 +1,6 @@ .main { .logo-con { - height: 64px; - padding: 10px; + height: 50px; img { height: 44px; width: auto; @@ -23,7 +22,7 @@ overflow: hidden; } .main-content-con { - height: ~'calc(100% - 60px)'; + height: ~'calc(100% - 70px)'; overflow: hidden; } .tag-nav-wrapper { @@ -32,14 +31,14 @@ background: #f0f0f0; } .content-wrapper { - padding: 18px; + padding: 16px; height: ~'calc(100% - 80px)'; overflow: auto; } .left-sider { .ivu-layout-sider-children { overflow-y: scroll; - margin-right: -18px; + margin-right: -16px; overflow-x: hidden; } } diff --git a/template/admin/src/components/main/main.vue b/template/admin/src/components/main/main.vue index 5a7314106..6964ebb9b 100644 --- a/template/admin/src/components/main/main.vue +++ b/template/admin/src/components/main/main.vue @@ -1,45 +1,45 @@