Merge branch 'master' of http://192.168.0.115:3000/shaogen1995/ShouBo into master

web/src/views/accessibility.vue

@@ -761,16 +761,20 @@ export default {
         styleNode.id = 'aria-zoom-style-node'
         document.head.appendChild(styleNode)
       }
-      styleNode.innerHTML = `
-        .aria-control-target {
-          transform: scale(${zoomFactors[this.ariaSettings.zoomLevel]});
-          transform-origin: top left;
-        }
-        .aria-no-zoom {
-          transform: scale(${1 / zoomFactors[this.ariaSettings.zoomLevel]});
-          transform-origin: top left;
-        }
-      `
+      if (zoomFactors[this.ariaSettings.zoomLevel] === 1) {
+        styleNode.innerHTML = ''
+      } else {
+        styleNode.innerHTML = `
+          .aria-control-target {
+            transform: scale(${zoomFactors[this.ariaSettings.zoomLevel]});
+            transform-origin: top left;
+          }
+          .aria-no-zoom {
+            transform: scale(${1 / zoomFactors[this.ariaSettings.zoomLevel]});
+            transform-origin: top left;
+          }
+        `
+      }
     },
     updateThemeClass() {
       this.$nextTick(() => {

web/src/views/layout/index.vue

@@ -224,7 +224,11 @@ export default {
       font-size: 14px;
       color: #fff;
       line-height: 60px;
-      overflow: hidden;
+      &::after {
+        content: ""; //伪元素必须有content属性，哪怕其实只是个空字符串。
+        display: block; //伪元素默认是inline，需要改为block。
+        clear: both;
+      }
       & > li {
         cursor: pointer;
         float: left;