Skip to content

Commit a96e471

Browse files
dark-flamesdark-flames
committed
Merge branch 'master' of github.com:luogu-dev/markdown-palettes
# Conflicts: # package.json # fix defaultContentParser
2 parents 3604b38 + 717d928 commit a96e471

20 files changed

+148
-79
lines changed

‎package.json‎

Lines changed: 56 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -1,54 +1,56 @@
1-
{
2-
"name": "markdown-palettes",
3-
"description": "Markdown*Palettes: Markdown editor for the modern web.",
4-
"version": "0.4.10",
5-
"author": "Luogu Dev Team",
6-
"license": "MIT",
7-
"main": "dist/MarkdownPalettes.common.js",
8-
"style": "dist/MarkdownPalettes.css",
9-
"scripts": {
10-
"dev": "vue-cli-service serve --open",
11-
"prod-test": "vue-cli-service serve --open --mode production",
12-
"build": "vue-cli-service build --name MarkdownPalettes --target lib src/module.js && vue-cli-service build --name MarkdownPalettesBrowser --target lib src/browserModule.js --no-clean && ./.after-build.sh && cp demo.html dist/demo.html",
13-
"build-lib": "vue-cli-service build --name MarkdownPalettes --target lib src/module.js && ./.after-build.sh",
14-
"build-browser": "vue-cli-service build --name MarkdownPalettesBrowser --target lib src/browserModule.js && ./.after-build.sh",
15-
"build-dev": "vue-cli-service build --name MarkdownPalettes --target lib src/browserModule.js --mode development",
16-
"lint": "vue-cli-service lint",
17-
"lint-fix": "vue-cli-service lint --fix",
18-
"analyze": "vue-cli-service build --name MarkdownPalettes --target lib src/browserModule.js --report",
19-
"test-dist": "hs dist"
20-
},
21-
"dependencies": {
22-
"@fortawesome/fontawesome-free": "^5.1.0",
23-
"axios": "^0.18.0",
24-
"codemirror": "^5.39.0",
25-
"global": "^4.3.2",
26-
"katex": "^0.9.0",
27-
"lodash": "4.17.10",
28-
"markdown-it": "^8.4.2",
29-
"markdown-it-v": "^1.2.1",
30-
"markdown-it-v-codemirror-highlighter": "1.0.0",
31-
"markdown-it-v-katex": "^1.0.0-alpha.1",
32-
"vue": "^2.5.11"
33-
},
34-
"devDependencies": {
35-
"@babel/plugin-proposal-object-rest-spread": "7.3.1",
36-
"@babel/preset-env": "7.3.1",
37-
"@vue/cli-plugin-babel": "^3.4.0",
38-
"@vue/cli-plugin-eslint": "^3.1.5",
39-
"@vue/cli-service": "3.4.0",
40-
"@vue/eslint-config-standard": "^4.0.0",
41-
"babel-plugin-lodash": "^3.3.4",
42-
"http-server": "^0.11.1",
43-
"stylus": "^0.54.5",
44-
"stylus-loader": "^3.0.2",
45-
"vue-template-compiler": "^2.5.16"
46-
},
47-
"browserslist": [
48-
"Edge >= 15",
49-
"Firefox >= 53",
50-
"Chrome >= 55",
51-
"Opera >= 42",
52-
"Safari >= 10.1"
53-
]
54-
}
1+
{
2+
"name": "markdown-palettes",
3+
"description": "Markdown*Palettes: Markdown editor for the modern web.",
4+
"version": "0.4.11",
5+
"author": "Luogu Dev Team",
6+
"license": "MIT",
7+
"main": "dist/MarkdownPalettes.common.js",
8+
"style": "dist/MarkdownPalettes.css",
9+
"scripts": {
10+
"dev": "vue-cli-service serve --open",
11+
"prod-test": "vue-cli-service serve --open --mode production",
12+
"build": "vue-cli-service build --name MarkdownPalettes --target lib src/module.js && vue-cli-service build --name MarkdownPalettesBrowser --target lib src/browserModule.js --no-clean && ./.after-build.sh && cp demo.html dist/demo.html",
13+
"build-lib": "vue-cli-service build --name MarkdownPalettes --target lib src/module.js && ./.after-build.sh",
14+
"build-browser": "vue-cli-service build --name MarkdownPalettesBrowser --target lib src/browserModule.js && ./.after-build.sh",
15+
"build-dev": "vue-cli-service build --name MarkdownPalettes --target lib src/browserModule.js --mode development",
16+
"lint": "vue-cli-service lint",
17+
"lint-fix": "vue-cli-service lint --fix",
18+
"analyze": "vue-cli-service build --name MarkdownPalettes --target lib src/browserModule.js --report",
19+
"test-dist": "hs dist"
20+
},
21+
"dependencies": {
22+
"@fortawesome/fontawesome-svg-core": "^1.2.15",
23+
"@fortawesome/free-solid-svg-icons": "^5.7.2",
24+
"@fortawesome/vue-fontawesome": "^0.1.6",
25+
"axios": "^0.18.0",
26+
"codemirror": "^5.39.0",
27+
"global": "^4.3.2",
28+
"katex": "^0.9.0",
29+
"lodash": "4.17.10",
30+
"markdown-it": "^8.4.2",
31+
"markdown-it-v": "^1.2.1",
32+
"markdown-it-v-codemirror-highlighter": "1.0.0",
33+
"markdown-it-v-katex": "^1.0.0-alpha.1",
34+
"vue": "^2.5.11"
35+
},
36+
"devDependencies": {
37+
"@babel/plugin-proposal-object-rest-spread": "7.3.1",
38+
"@babel/preset-env": "7.3.1",
39+
"@vue/cli-plugin-babel": "^3.4.0",
40+
"@vue/cli-plugin-eslint": "^3.1.5",
41+
"@vue/cli-service": "3.4.0",
42+
"@vue/eslint-config-standard": "^4.0.0",
43+
"babel-plugin-lodash": "^3.3.4",
44+
"http-server": "^0.11.1",
45+
"stylus": "^0.54.5",
46+
"stylus-loader": "^3.0.2",
47+
"vue-template-compiler": "^2.5.16"
48+
},
49+
"browserslist": [
50+
"Edge >= 15",
51+
"Firefox >= 53",
52+
"Chrome >= 55",
53+
"Opera >= 42",
54+
"Safari >= 10.1"
55+
]
56+
}

‎src/MarkdownPalettes.vue‎

Lines changed: 21 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,14 @@
1717
unselectable="on"
1818
@click="toolbarAction(item)">
1919
<i
20-
:class="['fa', ensureValue(item.icon)]"
21-
unselectable="on">{{ ensureValue(item.content) }}</i>
20+
v-if="item.hasOwnProperty('class')"
21+
:class="ensureValue(item.class)"
22+
unselectable="on"
23+
>{{ ensureValue(item.content) }}</i>
24+
<font-awesome-icon
25+
v-else-if="item.hasOwnProperty('icon')"
26+
:icon="ensureValue(item.icon)"
27+
/>
2228
</a>
2329
</li>
2430
</ul>
@@ -204,11 +210,21 @@
204210
margin: 0 5px
205211
height: 65%
206212
border-right: 1px solid #ddd
213+
.mp-icon-header
214+
text-align center
215+
display block
216+
padding 5px 0
217+
font-weight 900
218+
-moz-osx-font-smoothing grayscale
219+
-webkit-font-smoothing antialiased
220+
font-style normal
221+
font-variant normal
222+
text-rendering auto
223+
line-height 1
207224
</style>
208225

209226
<script>
210-
import '@fortawesome/fontawesome-free/css/solid.css'
211-
import '@fortawesome/fontawesome-free/css/fontawesome.css'
227+
import { FontAwesomeIcon } from '@fortawesome/vue-fontawesome'
212228
213229
import Dialog from './components/Dialog/Dialog.vue'
214230
import PreviewArea from './components/PreviewArea.js'
@@ -225,7 +241,7 @@ import { getText } from './utils/i18n'
225241
226242
export default {
227243
name: 'markdown-palettes',
228-
components: { 'editor-dialog': Dialog, PreviewArea },
244+
components: { FontAwesomeIcon, 'editor-dialog': Dialog, PreviewArea },
229245
mixins: [InputAreaMixin, PreviewAreaMixin, ToolbarMixin, ActionMixin],
230246
props: {
231247
value: {

‎src/components/ToolBarBtns/btn-bold.js‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
1+
import { faBold } from '@fortawesome/free-solid-svg-icons'
2+
13
export default {
24
name: 'bold',
3-
icon: 'fa-bold',
5+
icon: faBold,
46
title: '粗体',
57
action: {
68
insert: ['**', '**']

‎src/components/ToolBarBtns/btn-code.js‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
1+
import { faCode } from '@fortawesome/free-solid-svg-icons'
2+
13
export default {
24
name: 'img',
3-
icon: 'fa-code',
5+
icon: faCode,
46
title: '插入代码',
57
action () {
68
const selection = this.editor.getSelection()

‎src/components/ToolBarBtns/btn-fullscreen.js‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
1+
import { faExpandArrowsAlt } from '@fortawesome/free-solid-svg-icons'
2+
13
export default {
24
name: 'fullScreen',
3-
icon: 'fa-expand-arrows-alt',
5+
icon: faExpandArrowsAlt,
46
title () { return this.fullScreen ? '取消全屏' : '全屏' },
57
action: {
68
event: 'fullScreen'

‎src/components/ToolBarBtns/btn-header.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
export default function headerFactory (level) {
22
return {
33
name: 'h' + level,
4-
icon: 'icon-blold',
4+
class: ['mp-icon-header'],
55
content: 'H' + level,
66
title: level + '级标题',
77
action () {

‎src/components/ToolBarBtns/btn-hide.js‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
1+
import { faEye, faEyeSlash } from '@fortawesome/free-solid-svg-icons'
2+
13
export default {
24
name: 'hide',
3-
icon () { return this.previewDisplay === 'hide' ? 'fa-eye-slash' : 'fa-eye' },
5+
icon () { return this.previewDisplay === 'hide' ? faEyeSlash : faEye },
46
title () { return this.previewDisplay === 'hide' ? '显示预览' : '隐藏预览' },
57
action: {
68
event: 'hide'

‎src/components/ToolBarBtns/btn-hr.js‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
1+
import { faMinus } from '@fortawesome/free-solid-svg-icons'
2+
13
export default {
24
name: 'hr',
3-
icon: 'fa-minus',
5+
icon: faMinus,
46
title: '分割线',
57
action: {
68
insert: '\n\n------------\n'

‎src/components/ToolBarBtns/btn-img.js‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
1+
import { faImage } from '@fortawesome/free-solid-svg-icons'
2+
13
export default {
24
name: 'img',
3-
icon: 'fa-image',
5+
icon: faImage,
46
title: '插入图片',
57
action: {
68
request: {

‎src/components/ToolBarBtns/btn-info.jsx‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
1+
import { faInfoCircle } from '@fortawesome/free-solid-svg-icons'
2+
13
export default {
24
name: 'info',
3-
icon: 'fa-info-circle',
5+
icon: faInfoCircle,
46
title: '关于',
57
action () {
68
this.openDialog({

0 commit comments

Comments
 (0)