Skip to content

Commit 452c314

Browse files
Koooooo-7Koooooo-7
authored
Revert "fix: Legacy bugs (styles, site plugin error, and dev server error) (#1743)"
This reverts commit 84837e3.
1 parent 717523a commit 452c314

File tree

10 files changed

+35
-75
lines changed

10 files changed

+35
-75
lines changed

‎docs/index.html

Lines changed: 23 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555

5656
<body>
5757
<div id="app">Loading ...</div>
58-
<script src="//cdn.jsdelivr.net/npm/docsify-plugin-carbon@1"></script>
58+
<script src="//cdn.jsdelivr.net/npm/docsify-plugin-carbon@1/index.js"></script>
5959
<script>
6060
// Set html "lang" attribute based on URL
6161
var lang = location.hash.match(/#\/(de-de|es|ru-ru|zh-cn)\//);
@@ -118,21 +118,21 @@
118118
'/zh-cn/': '搜索',
119119
'/': 'Search',
120120
},
121-
pathNamespaces: ['/es', '/de-de', '/ru-ru', '/zh-cn'],
121+
pathNamespaces: ['/es', '/de-de', '/ru-ru', '/zh-cn']
122122
},
123123
vueComponents: {
124124
'button-counter': {
125125
template:
126126
'<button @click="count += 1">You clicked me {{ count }} times</button>',
127-
data: function () {
127+
data: function() {
128128
return {
129129
count: 0,
130130
};
131131
},
132132
},
133133
},
134134
vueGlobalOptions: {
135-
data: function () {
135+
data: function() {
136136
return {
137137
count: 0,
138138
message: 'Hello, World!',
@@ -145,7 +145,7 @@
145145
};
146146
},
147147
computed: {
148-
timeOfDay: function () {
148+
timeOfDay: function() {
149149
const date = new Date();
150150
const hours = date.getHours();
151151

@@ -159,14 +159,14 @@
159159
},
160160
},
161161
methods: {
162-
hello: function () {
162+
hello: function() {
163163
alert(this.message);
164164
},
165165
},
166166
},
167167
vueMounts: {
168168
'#counter': {
169-
data: function () {
169+
data: function() {
170170
return {
171171
count: 0,
172172
};
@@ -175,8 +175,8 @@
175175
},
176176
plugins: [
177177
DocsifyCarbon.create('CEBI6KQE', 'docsifyjsorg'),
178-
function (hook, vm) {
179-
hook.beforeEach(function (html) {
178+
function(hook, vm) {
179+
hook.beforeEach(function(html) {
180180
if (/githubusercontent\.com/.test(vm.route.file)) {
181181
url = vm.route.file
182182
.replace('raw.githubusercontent.com', 'github.com')
@@ -198,7 +198,7 @@
198198
'<a href="https://docsify.js.org" target="_blank" style="color: inherit; font-weight: normal; text-decoration: none;">Powered by docsify</a>'
199199
);
200200
}),
201-
hook.afterEach(function (html) {
201+
hook.afterEach(function(html) {
202202
if (vm.route.path === '/') {
203203
return html;
204204
}
@@ -218,15 +218,19 @@
218218
<script src="//cdn.jsdelivr.net/npm/prismjs@1/components/prism-nginx.min.js"></script>
219219
<script src="//cdn.jsdelivr.net/npm/prismjs@1/components/prism-php.min.js"></script>
220220
<script>
221-
// Public site only
222-
if (/docsify/.test(location.host)) {
223-
document.write(
224-
'<script src="//cdn.jsdelivr.net/npm/docsify@4/lib/plugins/ga.min.js"><\/script>'
225-
);
226-
document.write(
227-
'<script src="//cdn.jsdelivr.net/npm/docsify@4/lib/plugins/matomo.min.js"><\/script>'
228-
);
229-
}
221+
(function() {
222+
function loadJS(src, attrs) {
223+
document.write(
224+
'<script src="' + src + '" ' + (attrs || '') + '><\/script>'
225+
);
226+
}
227+
228+
// Public site only
229+
if (/docsify/.test(location.host)) {
230+
loadJS('//cdn.jsdelivr.net/npm/docsify@4/lib/plugins/ga.min.js');
231+
loadJS('//cdn.jsdelivr.net/npm/docsify@4/lib/plugins/matomo.min.js');
232+
}
233+
})();
230234
</script>
231235
<script src="//cdn.jsdelivr.net/npm/vue@2/dist/vue.min.js"></script>
232236
<!-- <script src="//cdn.jsdelivr.net/npm/vue@3/dist/vue.global.prod.js"></script> -->

‎index.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
<body>
2525
<div id="app"></div>
26-
<script src="//cdn.jsdelivr.net/npm/docsify-plugin-carbon@1"></script>
26+
<script src="//cdn.jsdelivr.net/npm/docsify-plugin-carbon@1/index.min.js"></script>
2727
<script>
2828
// Set html "lang" attribute based on URL
2929
var lang = location.hash.match(/#\/(de-de|es|ru-ru|zh-cn)\//);
@@ -82,12 +82,12 @@
8282
'/zh-cn/': '搜索',
8383
'/': 'Search',
8484
},
85-
pathNamespaces: ['/es', '/de-de', '/ru-ru', '/zh-cn'],
85+
pathNamespaces: ['/es', '/de-de', '/ru-ru', '/zh-cn']
8686
},
8787
plugins: [
8888
DocsifyCarbon.create('CEBI6KQE', 'docsifyjsorg'),
89-
function (hook, vm) {
90-
hook.beforeEach(function (html) {
89+
function(hook, vm) {
90+
hook.beforeEach(function(html) {
9191
if (/githubusercontent\.com/.test(vm.route.file)) {
9292
url = vm.route.file
9393
.replace('raw.githubusercontent.com', 'github.com')

‎src/plugins/search/component.js

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,9 @@ function style() {
3333
outline: none;
3434
border: none;
3535
width: 100%;
36-
padding: 0.6em 7px;
37-
font-size: inherit;
36+
padding: 0 7px;
37+
line-height: 36px;
38+
font-size: 14px;
3839
border: 1px solid transparent;
3940
}
4041
@@ -50,13 +51,6 @@ function style() {
5051
-moz-appearance: none;
5152
appearance: none;
5253
}
53-
54-
.search input::-ms-clear {
55-
display: none;
56-
height: 0;
57-
width: 0;
58-
}
59-
6054
.search .clear-button {
6155
cursor: pointer;
6256
width: 36px;

‎src/themes/basic/_coverpage.styl

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -64,13 +64,11 @@ section.cover
6464
padding 0
6565

6666
.cover-main > p:last-child a
67-
border-color $color-primary
6867
border-color var(--theme-color, $color-primary)
6968
border-radius 2rem
7069
border-style solid
7170
border-width 1px
7271
box-sizing border-box
73-
color $color-primary
7472
color var(--theme-color, $color-primary)
7573
display inline-block
7674
font-size 1.05rem
@@ -81,7 +79,6 @@ section.cover
8179
transition all 0.15s ease
8280

8381
&:last-child
84-
background-color $color-primary
8582
background-color var(--theme-color, $color-primary)
8683
color #fff
8784

@@ -93,10 +90,8 @@ section.cover
9390
color inherit
9491

9592
blockquote > p > a
96-
border-bottom 2px solid $color-primary
9793
border-bottom 2px solid var(--theme-color, $color-primary)
9894
transition color 0.3s
9995

10096
&:hover
101-
color $color-primary
10297
color var(--theme-color, $color-primary)

‎src/themes/basic/_layout.styl

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ div#app
2626
vertical-align middle
2727

2828
.progress
29-
background-color $color-primary
3029
background-color var(--theme-color, $color-primary)
3130
height 2px
3231
left 0px
@@ -38,11 +37,9 @@ div#app
3837
z-index 999999
3938

4039
.search a:hover
41-
color $color-primary
4240
color var(--theme-color, $color-primary)
4341

4442
.search .search-keyword
45-
color $color-primary
4643
color var(--theme-color, $color-primary)
4744
font-style normal
4845
font-weight bold
@@ -111,13 +108,10 @@ li input[type='checkbox']
111108
transition color 0.3s
112109

113110
&:hover
114-
color $color-primary
115111
color var(--theme-color, $color-primary)
116112

117113
&.active
118-
border-bottom 2px solid $color-primary
119114
border-bottom 2px solid var(--theme-color, $color-primary)
120-
color $color-primary
121115
color var(--theme-color, $color-primary)
122116

123117
/* navbar dropdown */
@@ -178,7 +172,6 @@ li input[type='checkbox']
178172

179173
svg
180174
color $color-bg
181-
fill $color-primary
182175
fill var(--theme-color, $color-primary)
183176
height 80px
184177
width 80px
@@ -291,7 +284,6 @@ main.hidden
291284
opacity 0.4
292285

293286
span
294-
background-color $color-primary
295287
background-color var(--theme-color, $color-primary)
296288
display block
297289
margin-bottom 4px

‎src/themes/buble.styl

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ $sidebar-width = 16rem
4040
font-weight 600
4141

4242
.markdown-section a
43-
color $color-primary
4443
color var(--theme-color, $color-primary)
4544

4645
.markdown-section p, .markdown-section ul, .markdown-section ol
@@ -84,7 +83,6 @@ $sidebar-width = 16rem
8483
margin 0
8584

8685
.markdown-section blockquote
87-
border-left 4px solid $color-primary
8886
border-left 4px solid var(--theme-color, $color-primary)
8987
color #858585
9088
margin 2em 0

‎src/themes/dark.styl

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ body
3434
padding 0
3535

3636
ul li.active > a
37-
color $color-primary
3837
color var(--theme-color, $color-primary)
3938
font-weight 600
4039

@@ -44,7 +43,6 @@ body
4443
font-weight 600
4544

4645
.markdown-section a
47-
color $color-primary
4846
color var(--theme-color, $color-primary)
4947
font-weight 600
5048

@@ -81,7 +79,6 @@ body
8179
padding-left 1.5rem
8280

8381
.markdown-section blockquote
84-
border-left 4px solid $color-primary
8582
border-left 4px solid var(--theme-color, $color-primary)
8683
color #858585
8784
margin 2em 0
@@ -141,7 +138,6 @@ body
141138
color #2973b7
142139

143140
.token.string
144-
color $color-primary
145141
color var(--theme-color, $color-primary)
146142

147143
.token.selector
@@ -154,7 +150,6 @@ body
154150
color #22a2c9
155151

156152
.token.attr-value, .token.control, .token.directive, .token.unit
157-
color $color-primary
158153
color var(--theme-color, $color-primary)
159154

160155
.token.keyword

‎src/themes/dolphin.styl

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ body
3636

3737
ul li.active > a
3838
border-right 2px solid
39-
color $color-primary
4039
color var(--theme-color, $color-primary)
4140
font-weight 600
4241

@@ -53,10 +52,9 @@ body
5352
font-weight 600
5453

5554
.markdown-section a
56-
color $color-primary
5755
color var(--theme-color, $color-primary)
5856
font-weight 600
59-
57+
6058
&:hover
6159
text-decoration underline
6260

@@ -93,7 +91,6 @@ body
9391
padding-left 1.5rem
9492

9593
.markdown-section blockquote
96-
border-left 4px solid $color-primary
9794
border-left 4px solid var(--theme-color, $color-primary)
9895
color #858585
9996
margin 2em 0
@@ -153,7 +150,6 @@ body
153150
color #2973b7
154151

155152
.token.string
156-
color $color-primary
157153
color var(--theme-color, $color-primary)
158154

159155
.token.selector
@@ -166,7 +162,6 @@ body
166162
color #22a2c9
167163

168164
.token.attr-value, .token.control, .token.directive, .token.unit
169-
color $color-primary
170165
color var(--theme-color, $color-primary)
171166

172167
.token.keyword, .token.function

‎src/themes/vue.styl

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ body
3636

3737
ul li.active > a
3838
border-right 2px solid
39-
color $color-primary
4039
color var(--theme-color, $color-primary)
4140
font-weight 600
4241

@@ -53,7 +52,6 @@ body
5352
font-weight 600
5453

5554
.markdown-section a
56-
color $color-primary
5755
color var(--theme-color, $color-primary)
5856
font-weight 600
5957

@@ -90,7 +88,6 @@ body
9088
padding-left 1.5rem
9189

9290
.markdown-section blockquote
93-
border-left 4px solid $color-primary
9491
border-left 4px solid var(--theme-color, $color-primary)
9592
color #858585
9693
margin 2em 0
@@ -207,7 +204,6 @@ body
207204
color #2973b7
208205

209206
.token.string
210-
color $color-primary
211207
color var(--theme-color, $color-primary)
212208

213209
.token.selector
@@ -220,7 +216,6 @@ body
220216
color #22a2c9
221217

222218
.token.attr-value, .token.control, .token.directive, .token.unit
223-
color $color-primary
224219
color var(--theme-color, $color-primary)
225220

226221
.token.keyword, .token.function

0 commit comments

Comments
 (0)