From 452c314c8f2623c6bf34f427c5942d6cecc83f5d Mon Sep 17 00:00:00 2001
From: Koy Zhuang <369491420@qq.com>
Date: Wed, 26 Oct 2022 22:36:01 +0800
Subject: [PATCH] Revert "fix: Legacy bugs (styles, site plugin error, and dev
 server error) (#1743)"

This reverts commit 84837e36ff231e202b971f46550516439b141e8b.
---
 docs/index.html                  | 42 +++++++++++++++++---------------
 index.html                       |  8 +++---
 src/plugins/search/component.js  | 12 +++------
 src/themes/basic/_coverpage.styl |  5 ----
 src/themes/basic/_layout.styl    |  8 ------
 src/themes/buble.styl            |  2 --
 src/themes/dark.styl             |  5 ----
 src/themes/dolphin.styl          |  7 +-----
 src/themes/vue.styl              |  5 ----
 test/config/server.js            | 16 +++---------
 10 files changed, 35 insertions(+), 75 deletions(-)
diff --git a/docs/index.html b/docs/index.html
index ef03476d6a..de3ce26630 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -55,7 +55,7 @@
 
   <body>
     <div id="app">Loading ...</div>
-    <script src="//cdn.jsdelivr.net/npm/docsify-plugin-carbon@1"></script>
+    <script src="//cdn.jsdelivr.net/npm/docsify-plugin-carbon@1/index.js"></script>
     <script>
       // Set html "lang" attribute based on URL
       var lang = location.hash.match(/#\/(de-de|es|ru-ru|zh-cn)\//);
@@ -118,13 +118,13 @@
             '/zh-cn/': '搜索',
             '/': 'Search',
           },
-          pathNamespaces: ['/es', '/de-de', '/ru-ru', '/zh-cn'],
+          pathNamespaces: ['/es', '/de-de', '/ru-ru', '/zh-cn']
         },
         vueComponents: {
           'button-counter': {
             template:
               '<button @click="count += 1">You clicked me {{ count }} times</button>',
-            data: function () {
+            data: function() {
               return {
                 count: 0,
               };
@@ -132,7 +132,7 @@
           },
         },
         vueGlobalOptions: {
-          data: function () {
+          data: function() {
             return {
               count: 0,
               message: 'Hello, World!',
@@ -145,7 +145,7 @@
             };
           },
           computed: {
-            timeOfDay: function () {
+            timeOfDay: function() {
               const date = new Date();
               const hours = date.getHours();
 
@@ -159,14 +159,14 @@
             },
           },
           methods: {
-            hello: function () {
+            hello: function() {
               alert(this.message);
             },
           },
         },
         vueMounts: {
           '#counter': {
-            data: function () {
+            data: function() {
               return {
                 count: 0,
               };
@@ -175,8 +175,8 @@
         },
         plugins: [
           DocsifyCarbon.create('CEBI6KQE', 'docsifyjsorg'),
-          function (hook, vm) {
-            hook.beforeEach(function (html) {
+          function(hook, vm) {
+            hook.beforeEach(function(html) {
               if (/githubusercontent\.com/.test(vm.route.file)) {
                 url = vm.route.file
                   .replace('raw.githubusercontent.com', 'github.com')
@@ -198,7 +198,7 @@
                 '<a href="https://docsify.js.org" target="_blank" style="color: inherit; font-weight: normal; text-decoration: none;">Powered by docsify</a>'
               );
             }),
-              hook.afterEach(function (html) {
+              hook.afterEach(function(html) {
                 if (vm.route.path === '/') {
                   return html;
                 }
@@ -218,15 +218,19 @@
     <script src="//cdn.jsdelivr.net/npm/prismjs@1/components/prism-nginx.min.js"></script>
     <script src="//cdn.jsdelivr.net/npm/prismjs@1/components/prism-php.min.js"></script>
     <script>
-      // Public site only
-      if (/docsify/.test(location.host)) {
-        document.write(
-          '<script src="//cdn.jsdelivr.net/npm/docsify@4/lib/plugins/ga.min.js"><\/script>'
-        );
-        document.write(
-          '<script src="//cdn.jsdelivr.net/npm/docsify@4/lib/plugins/matomo.min.js"><\/script>'
-        );
-      }
+      (function() {
+        function loadJS(src, attrs) {
+          document.write(
+            '<script src="' + src + '" ' + (attrs || '') + '><\/script>'
+          );
+        }
+
+        // Public site only
+        if (/docsify/.test(location.host)) {
+          loadJS('//cdn.jsdelivr.net/npm/docsify@4/lib/plugins/ga.min.js');
+          loadJS('//cdn.jsdelivr.net/npm/docsify@4/lib/plugins/matomo.min.js');
+        }
+      })();
     </script>
     <script src="//cdn.jsdelivr.net/npm/vue@2/dist/vue.min.js"></script>
     <!-- <script src="//cdn.jsdelivr.net/npm/vue@3/dist/vue.global.prod.js"></script> -->
diff --git a/index.html b/index.html
index 388969e8c2..206c1fe3dd 100644
--- a/index.html
+++ b/index.html
@@ -23,7 +23,7 @@
 
   <body>
     <div id="app"></div>
-    <script src="//cdn.jsdelivr.net/npm/docsify-plugin-carbon@1"></script>
+    <script src="//cdn.jsdelivr.net/npm/docsify-plugin-carbon@1/index.min.js"></script>
     <script>
       // Set html "lang" attribute based on URL
       var lang = location.hash.match(/#\/(de-de|es|ru-ru|zh-cn)\//);
@@ -82,12 +82,12 @@
             '/zh-cn/': '搜索',
             '/': 'Search',
           },
-          pathNamespaces: ['/es', '/de-de', '/ru-ru', '/zh-cn'],
+          pathNamespaces: ['/es', '/de-de', '/ru-ru', '/zh-cn']
         },
         plugins: [
           DocsifyCarbon.create('CEBI6KQE', 'docsifyjsorg'),
-          function (hook, vm) {
-            hook.beforeEach(function (html) {
+          function(hook, vm) {
+            hook.beforeEach(function(html) {
               if (/githubusercontent\.com/.test(vm.route.file)) {
                 url = vm.route.file
                   .replace('raw.githubusercontent.com', 'github.com')
diff --git a/src/plugins/search/component.js b/src/plugins/search/component.js
index 946cc015ec..06a698e172 100644
--- a/src/plugins/search/component.js
+++ b/src/plugins/search/component.js
@@ -33,8 +33,9 @@ function style() {
   outline: none;
   border: none;
   width: 100%;
-  padding: 0.6em 7px;
-  font-size: inherit;
+  padding: 0 7px;
+  line-height: 36px;
+  font-size: 14px;
   border: 1px solid transparent;
 }
 
@@ -50,13 +51,6 @@ function style() {
   -moz-appearance: none;
   appearance: none;
 }
-
-.search input::-ms-clear {
-  display: none;
-  height: 0;
-  width: 0;
-}
-
 .search .clear-button {
   cursor: pointer;
   width: 36px;
diff --git a/src/themes/basic/_coverpage.styl b/src/themes/basic/_coverpage.styl
index 9c8130673d..13e04fc418 100644
--- a/src/themes/basic/_coverpage.styl
+++ b/src/themes/basic/_coverpage.styl
@@ -64,13 +64,11 @@ section.cover
     padding 0
 
   .cover-main > p:last-child a
-    border-color $color-primary
     border-color var(--theme-color, $color-primary)
     border-radius 2rem
     border-style solid
     border-width 1px
     box-sizing border-box
-    color $color-primary
     color var(--theme-color, $color-primary)
     display inline-block
     font-size 1.05rem
@@ -81,7 +79,6 @@ section.cover
     transition all 0.15s ease
 
     &:last-child
-      background-color $color-primary
       background-color var(--theme-color, $color-primary)
       color #fff
 
@@ -93,10 +90,8 @@ section.cover
       color inherit
 
   blockquote > p > a
-    border-bottom 2px solid $color-primary
     border-bottom 2px solid var(--theme-color, $color-primary)
     transition color 0.3s
 
     &:hover
-      color $color-primary
       color var(--theme-color, $color-primary)
diff --git a/src/themes/basic/_layout.styl b/src/themes/basic/_layout.styl
index c14ce685ea..15b6464fb9 100644
--- a/src/themes/basic/_layout.styl
+++ b/src/themes/basic/_layout.styl
@@ -26,7 +26,6 @@ div#app
   vertical-align middle
 
 .progress
-  background-color $color-primary
   background-color var(--theme-color, $color-primary)
   height 2px
   left 0px
@@ -38,11 +37,9 @@ div#app
   z-index 999999
 
 .search a:hover
-  color $color-primary
   color var(--theme-color, $color-primary)
 
 .search .search-keyword
-  color $color-primary
   color var(--theme-color, $color-primary)
   font-style normal
   font-weight bold
@@ -111,13 +108,10 @@ li input[type='checkbox']
     transition color 0.3s
 
     &:hover
-      color $color-primary
       color var(--theme-color, $color-primary)
 
     &.active
-      border-bottom 2px solid $color-primary
       border-bottom 2px solid var(--theme-color, $color-primary)
-      color $color-primary
       color var(--theme-color, $color-primary)
 
   /* navbar dropdown */
@@ -178,7 +172,6 @@ li input[type='checkbox']
 
   svg
     color $color-bg
-    fill $color-primary
     fill var(--theme-color, $color-primary)
     height 80px
     width 80px
@@ -291,7 +284,6 @@ main.hidden
     opacity 0.4
 
   span
-    background-color $color-primary
     background-color var(--theme-color, $color-primary)
     display block
     margin-bottom 4px
diff --git a/src/themes/buble.styl b/src/themes/buble.styl
index 1602512bfc..1f633c2df1 100644
--- a/src/themes/buble.styl
+++ b/src/themes/buble.styl
@@ -40,7 +40,6 @@ $sidebar-width = 16rem
   font-weight 600
 
 .markdown-section a
-  color $color-primary
   color var(--theme-color, $color-primary)
 
 .markdown-section p, .markdown-section ul, .markdown-section ol
@@ -84,7 +83,6 @@ $sidebar-width = 16rem
   margin 0
 
 .markdown-section blockquote
-  border-left 4px solid $color-primary
   border-left 4px solid var(--theme-color, $color-primary)
   color #858585
   margin 2em 0
diff --git a/src/themes/dark.styl b/src/themes/dark.styl
index ff0bd783dd..c53e8d9f00 100644
--- a/src/themes/dark.styl
+++ b/src/themes/dark.styl
@@ -34,7 +34,6 @@ body
     padding 0
 
   ul li.active > a
-    color $color-primary
     color var(--theme-color, $color-primary)
     font-weight 600
 
@@ -44,7 +43,6 @@ body
   font-weight 600
 
 .markdown-section a
-  color $color-primary
   color var(--theme-color, $color-primary)
   font-weight 600
 
@@ -81,7 +79,6 @@ body
   padding-left 1.5rem
 
 .markdown-section blockquote
-  border-left 4px solid $color-primary
   border-left 4px solid var(--theme-color, $color-primary)
   color #858585
   margin 2em 0
@@ -141,7 +138,6 @@ body
   color #2973b7
 
 .token.string
-  color $color-primary
   color var(--theme-color, $color-primary)
 
 .token.selector
@@ -154,7 +150,6 @@ body
   color #22a2c9
 
 .token.attr-value, .token.control, .token.directive, .token.unit
-  color $color-primary
   color var(--theme-color, $color-primary)
 
 .token.keyword
diff --git a/src/themes/dolphin.styl b/src/themes/dolphin.styl
index aee2122e87..ded9b16c4f 100644
--- a/src/themes/dolphin.styl
+++ b/src/themes/dolphin.styl
@@ -36,7 +36,6 @@ body
 
   ul li.active > a
     border-right 2px solid
-    color $color-primary
     color var(--theme-color, $color-primary)
     font-weight 600
 
@@ -53,10 +52,9 @@ body
   font-weight 600
 
 .markdown-section a
-  color $color-primary
   color var(--theme-color, $color-primary)
   font-weight 600
-
+  
   &:hover
       text-decoration underline
 
@@ -93,7 +91,6 @@ body
   padding-left 1.5rem
 
 .markdown-section blockquote
-  border-left 4px solid $color-primary
   border-left 4px solid var(--theme-color, $color-primary)
   color #858585
   margin 2em 0
@@ -153,7 +150,6 @@ body
   color #2973b7
 
 .token.string
-  color $color-primary
   color var(--theme-color, $color-primary)
 
 .token.selector
@@ -166,7 +162,6 @@ body
   color #22a2c9
 
 .token.attr-value, .token.control, .token.directive, .token.unit
-  color $color-primary
   color var(--theme-color, $color-primary)
 
 .token.keyword, .token.function
diff --git a/src/themes/vue.styl b/src/themes/vue.styl
index 7eb7ed82f4..35fdaf4cef 100644
--- a/src/themes/vue.styl
+++ b/src/themes/vue.styl
@@ -36,7 +36,6 @@ body
 
   ul li.active > a
     border-right 2px solid
-    color $color-primary
     color var(--theme-color, $color-primary)
     font-weight 600
 
@@ -53,7 +52,6 @@ body
   font-weight 600
 
 .markdown-section a
-  color $color-primary
   color var(--theme-color, $color-primary)
   font-weight 600
 
@@ -90,7 +88,6 @@ body
   padding-left 1.5rem
 
 .markdown-section blockquote
-  border-left 4px solid $color-primary
   border-left 4px solid var(--theme-color, $color-primary)
   color #858585
   margin 2em 0
@@ -207,7 +204,6 @@ body
   color #2973b7
 
 .token.string
-  color $color-primary
   color var(--theme-color, $color-primary)
 
 .token.selector
@@ -220,7 +216,6 @@ body
   color #22a2c9
 
 .token.attr-value, .token.control, .token.directive, .token.unit
-  color $color-primary
   color var(--theme-color, $color-primary)
 
 .token.keyword, .token.function
diff --git a/test/config/server.js b/test/config/server.js
index e1181dbcc4..d7a9cb0897 100644
--- a/test/config/server.js
+++ b/test/config/server.js
@@ -44,26 +44,18 @@ function startServer(options = {}, cb = Function.prototype) {
         match: /<\/body>/i,
         fn: function (snippet, match) {
           // Override changelog alias to load local changelog (see routes)
-          const newSnippet = `
-            ${snippet.replace(/<script[^>]*/, '$& type="text/plain"')}
+          const injectJS = `
             <script>
+              // Fix /docs site configuration during tests
               (function() {
-                var aliasConfig = (window && window.$docsify && window.$docsify.alias) || {};
-                var isIE = /*@cc_on!@*/false || !!document.documentMode;
+                const aliasConfig = (window && window.$docsify && window.$docsify.alias) || {};
 
-                // Fix /docs site configuration during tests
                 aliasConfig['.*?/changelog'] = '/changelog.md';
-
-                // Enable BrowserSync snippet for non-IE browsers
-                if (!isIE) {
-                  document.querySelector('#__bs_script__').removeAttribute('type');
-                }
               })();
             </script>
-            ${match}
           `;
 
-          return newSnippet;
+          return injectJS + snippet + match;
         },
       },
     },
