Merge branch 'develop' into release-test

@@ -144,12 +144,12 @@ header {
     position: relative;
     position: relative;
     width: var(--g-sub-sidebar-width);
     width: var(--g-sub-sidebar-width);
     height: inherit;
     height: inherit;
-    padding-left: 18px;
+    // padding-left: 18px;
     padding-right: 0;
     padding-right: 0;
     background-color: inherit;
     background-color: inherit;
 
 
     .logo {
     .logo {
-      width: 180px;
+      width: 179px;
       height: 48px;
       height: 48px;
     }
     }
 
 

@@ -36,7 +36,7 @@ const to = computed(() => {
   z-index: 1000;
   z-index: 1000;
   top: 0;
   top: 0;
   width: inherit;
   width: inherit;
-  padding: 0 10px;
+  // padding: 0 10px;
   display: flex;
   display: flex;
   align-items: center;
   align-items: center;
   justify-content: space-between;
   justify-content: space-between;
@@ -69,5 +69,8 @@ const to = computed(() => {
   .el-divider {
   .el-divider {
     height: 1.5rem;
     height: 1.5rem;
     margin-right: 0;
     margin-right: 0;
+    margin: 0;
+
   }
   }
-}</style>
+}
+</style>