diff --git a/template/admin/src/components/main/components/fullscreen/fullscreen.vue b/template/admin/src/components/main/components/fullscreen/fullscreen.vue
index 0b0379b81..0a27b59ad 100644
--- a/template/admin/src/components/main/components/fullscreen/fullscreen.vue
+++ b/template/admin/src/components/main/components/fullscreen/fullscreen.vue
@@ -85,6 +85,8 @@ export default {
}
.full-screen-btn-con .ivu-tooltip-rel i {
font-size: 20px !important;
+ color: rgba(0, 0, 0, 0.65);
+
}
.full-screen-btn-con .ivu-tooltip-rel {
height: 50px;
diff --git a/template/admin/src/components/main/components/header-bar/custom-bread-crumb/custom-bread-crumb.vue b/template/admin/src/components/main/components/header-bar/custom-bread-crumb/custom-bread-crumb.vue
index 6ad5af636..5ce458c31 100644
--- a/template/admin/src/components/main/components/header-bar/custom-bread-crumb/custom-bread-crumb.vue
+++ b/template/admin/src/components/main/components/header-bar/custom-bread-crumb/custom-bread-crumb.vue
@@ -1,15 +1,15 @@
-
+
{{ item.title }}
-
+
{{ listLast[0].title }}
-
+
{{ listLast[0].title }}
@@ -19,7 +19,7 @@
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 4997ed025..43bc14527 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
@@ -3,6 +3,13 @@
height: 100%;
position: relative;
color: #fff !important;
+ display: flex;
+ justify-content: space-between;
+
+ .header-l{
+ display: flex;
+ align-items: center;
+ }
.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 2dfc22fc2..b61ea1d4d 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
@@ -1,26 +1,25 @@
+
diff --git a/template/admin/src/components/main/components/side-menu/side-menu-item.vue b/template/admin/src/components/main/components/side-menu/side-menu-item.vue
index 713409f2d..0b4a23b10 100644
--- a/template/admin/src/components/main/components/side-menu/side-menu-item.vue
+++ b/template/admin/src/components/main/components/side-menu/side-menu-item.vue
@@ -1,7 +1,6 @@
-
{{ parentItem.title }}
@@ -9,13 +8,13 @@
{{ item.children[0].title }}{{ item.children[0].title }}
{{ item.title }}{{ item.title }}
diff --git a/template/admin/src/components/main/components/side-menu/side-menu.less b/template/admin/src/components/main/components/side-menu/side-menu.less
index 789adadd0..67aaf4448 100644
--- a/template/admin/src/components/main/components/side-menu/side-menu.less
+++ b/template/admin/src/components/main/components/side-menu/side-menu.less
@@ -1,17 +1,24 @@
+@side-width: 80px;
+@side-height: 50px;
+@side-child-width: 160px;
+@child-menu-height: 50px;
+@side-dark-theme: #282c34;
+@side-dark-theme-font-color: #fff;
.side-menu-wrapper {
user-select: none;
+ height: 100%;
.menu-collapsed {
- padding-top: 8px;
+ height: 100%;
+ background-color: @side-dark-theme;
+ color: #fff !important;
.ivu-dropdown {
width: 100%;
- margin-bottom: 4px;
.ivu-dropdown-rel a {
width: 100%;
}
}
.ivu-tooltip {
width: 100%;
- margin-bottom: 4px;
.ivu-tooltip-rel {
width: 100%;
@@ -28,11 +35,14 @@
}
}
a.drop-menu-a {
- display: inline-block;
- padding: 10px 10px;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ height: @side-height;
+ line-height: @side-height;
width: 100%;
text-align: center;
- color: #495060;
+ color: @side-dark-theme-font-color;
}
}
diff --git a/template/admin/src/components/main/components/side-menu/side-menu.vue b/template/admin/src/components/main/components/side-menu/side-menu.vue
index 125f6d299..f92e4ee9c 100644
--- a/template/admin/src/components/main/components/side-menu/side-menu.vue
+++ b/template/admin/src/components/main/components/side-menu/side-menu.vue
@@ -1,16 +1,16 @@