Skip to content

Commit 5853d6b

Browse files
author
18033281
committed
update , delete desc
1 parent 2d55117 commit 5853d6b

8 files changed

+15463
-309
lines changed

dist/docsify-demo-box-vue.js

+277-239
Large diffs are not rendered by default.

dist/docsify-demo-box-vue.min.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/docsify-demo-box-vue.min.js.map

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package-lock.json

+15,174
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
"html-webpack-plugin": "^2.28.0",
3636
"http-proxy-middleware": "^0.17.3",
3737
"marked": "^0.3.6",
38-
"node-sass": "^4.5.3",
38+
"node-sass": "^4.12.0",
3939
"npm": "^5.1.0",
4040
"opn": "^4.0.2",
4141
"optimize-css-assets-webpack-plugin": "^1.3.0",

src/App.vue

-5
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,6 @@ let cssResources = '@import url("//unpkg.com/element-ui/lib/theme-default/index.
1717
let bootCode = 'Vue.use(DataTables)\n'
1818
1919
let code = `
20-
<desc>
21-
Hello \`world\`
22-
* a
23-
* b
24-
</desc>
2520
2621
<style>
2722
.wrapper {

src/components/demo-block.vue

+9-58
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,6 @@
66
@mouseleave="hovering = false">
77
<slot name="source"></slot>
88
<div class="meta" ref="meta">
9-
<div class="description">
10-
<div v-html="desc"></div>
11-
<button class='go' type="primary" @click="goJsfiddle">Try in Jsfiddle!</button>
12-
</div>
139
<div class="highlight" v-html='codePrismed'></div>
1410
</div>
1511
<div class="demo-block-control"
@@ -20,6 +16,9 @@
2016
<transition name="text-slide">
2117
<span>{{ controlText }}</span>
2218
</transition>
19+
<transition name="text-slide">
20+
<span class="fr" @click="goJsfiddle">Go jsfiddle</span>
21+
</transition>
2322
</div>
2423
</div>
2524
</template>
@@ -55,56 +54,8 @@
5554
transition: height .2s;
5655
}
5756
58-
.description {
59-
padding: 18px 24px;
60-
width: 40%;
61-
box-sizing: border-box;
62-
border-left: solid 1px #eaeefb;
63-
float: right;
64-
font-size: 14px;
65-
line-height: 1.8;
66-
color: #5e6d82;
67-
word-break: break-word;
68-
69-
p {
70-
margin: 0 0 12px;
71-
line-height: 1.8;
72-
}
73-
74-
code {
75-
color: #5e6d82;
76-
background-color: #e6effb;
77-
margin: 0 4px;
78-
display: inline-block;
79-
padding: 1px 5px;
80-
font-size: 12px;
81-
border-radius: 3px;
82-
height: 18px;
83-
line-height: 18px;
84-
}
85-
86-
button {
87-
height: 36px;
88-
line-height: 36px;
89-
text-align: center;
90-
background: #20a0ff;
91-
border: none;
92-
outline: none;
93-
border-radius: 5px;
94-
color: white;
95-
display: block;
96-
font-size: 14px;
97-
padding-left: 10px;
98-
padding-right: 10px;
99-
100-
&:hover {
101-
background: #4db3ff;
102-
}
103-
}
104-
}
105-
10657
.highlight {
107-
width: 60%;
58+
width: 100%;
10859
border-right: solid 1px #eaeefb;
10960
11061
pre {
@@ -165,6 +116,10 @@
165116
display: inline-block;
166117
color: #58B7FF;
167118
119+
&.fr {
120+
right: 15px;
121+
}
122+
168123
&:hover {
169124
color: #1D8CE0;
170125
}
@@ -202,10 +157,6 @@
202157
},
203158
type: Object
204159
},
205-
desc: {
206-
type: String,
207-
default: ''
208-
},
209160
code: {
210161
type: String,
211162
default: ''
@@ -300,7 +251,7 @@
300251
codePrismed() {
301252
createStyle(this.jsfiddle.style)
302253
303-
let hl = Prism.highlight(striptags.strip(this.code, ['desc', 'lang', 'no-boot-code']).replace(/\/\*.*\*\/\s*/g, ''), Prism.languages[this.lang] || Prism.languages.markup)
254+
let hl = Prism.highlight(striptags.strip(this.code, ['lang', 'no-boot-code']).replace(/\/\*.*\*\/\s*/g, ''), Prism.languages[this.lang] || Prism.languages.markup)
304255
305256
return `<pre data-lang="${this.lang}">
306257
<code class="lang-${this.lang}">${hl}</code>

src/components/index.js

-4
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@ export let generateComponent = function(code, lang, jsResources, cssResources, b
1111
let html = striptags.fetch(code, 'template')
1212
let style = striptags.fetch(code, 'style')
1313
let script = striptags.fetch(code, 'script')
14-
let descOrg = striptags.fetch(code, 'desc')
15-
let desc = marked && marked(descOrg) || descOrg
1614
let noBootCode = code.indexOf('/*no-boot-code*/') > -1
1715
if (noBootCode) {
1816
bootCode = ""
@@ -43,7 +41,6 @@ export let generateComponent = function(code, lang, jsResources, cssResources, b
4341
<demo-block class="demo-box"
4442
:jsfiddle="jsfiddle"
4543
:code="code"
46-
:desc="desc"
4744
:lang="lang"
4845
:js-resources="allJsResources"
4946
:css-resources="cssResources"
@@ -65,7 +62,6 @@ export let generateComponent = function(code, lang, jsResources, cssResources, b
6562
return {
6663
jsfiddle: {html, style, script},
6764
code,
68-
desc,
6965
lang,
7066
allJsResources,
7167
cssResources,

0 commit comments

Comments
 (0)