From e7726b7a5c456e279f58788c4a366c13796102e6 Mon Sep 17 00:00:00 2001 From: yanglbme Date: Thu, 5 Dec 2019 21:22:05 +0800 Subject: [PATCH 1/2] docs: update progress for new feature MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 更新最新特性进度 --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 194a6be..5e56b70 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,7 @@ - [x] 支持链接微信图文，外链自动转为文末索引 - [x] 支持一键复制并粘贴到公众号后台 - [x] 支持图片上传并将 URL 插入编辑器光标定位处 -- [ ] 实现自定义 CSS 并实时渲染（待开发） +- [ ] 实现自定义 CSS 并实时渲染（[开发中](https://github.com/doocs/md/tree/feat/custom-css)） ![select-and-replace-color-theme](./assets/images/select-and-replace-color-theme.gif) @@ -38,6 +38,7 @@ - [10 道 BAT 大厂海量数据面试题（附题解+方法总结）](https://mp.weixin.qq.com/s/rjGqxUvrEqJNlo09GrT1Dw) - [阿里又一个 20k+ stars 开源项目诞生，恭喜 fastjson！](https://mp.weixin.qq.com/s/RNKDCK2KoyeuMeEs6GUrow) +注：如果你使用了本 Markdown 编辑器进行文章排版，并且希望将你的文章加入示例列表，欢迎随时提交 PR。 ## 我的公众号 GitHub 技术社区 Doocs 旗下唯一公众号“Doocs 开源社区”，欢迎关注，专注于分享有价值的文章；当然，也可以加我个人微信（备注：GitHub）。 From 7d992e4a798351ffb5aa14bef025dfb5921f6780 Mon Sep 17 00:00:00 2001 From: yanglbme Date: Thu, 5 Dec 2019 22:04:32 +0800 Subject: [PATCH 2/2] style: update default color themes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 更新可选颜色：添加2020年度色（经典蓝） --- assets/scripts/editor.js | 10 +++++----- assets/scripts/themes/default-theme.js | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/assets/scripts/editor.js b/assets/scripts/editor.js index 6557a56..ae87f8f 100644 --- a/assets/scripts/editor.js +++ b/assets/scripts/editor.js @@ -7,7 +7,7 @@ let app = new Vue({ source: '', editorThemes: [ { label: '淡雅', value: 'xq-light' }, - { label: '精美', value: 'eclipse' }, + { label: '精致', value: 'eclipse' }, { label: '暗绿', value: 'oceanic-next' } ], editor: null, @@ -27,16 +27,16 @@ let app = new Vue({ { label: '15px', value: '15px', desc: '稍大' } ], colorOption: [ - { label: '橘红', value: 'rgba(255, 95, 46, 0.9)', hex: '#FF5F2E' }, - { label: '淡绿', value: 'rgba(66, 185, 131, 0.9)', hex: '#42B983' }, - { label: '暗青', value: 'rgba(0, 139, 139, 0.9)', hex: '#008B8B' } + { label: '经典蓝', value: 'rgba(15, 76, 129, 0.9)', hex: '最新流行色' }, + { label: '翡翠绿', value: 'rgba(0, 152, 116, 0.9)', hex: '清新且优雅' }, + { label: '辣椒红', value: 'rgba(155, 35, 53, 0.9)', hex: '自信且迷人' } ], aboutDialogVisible: false }; d.currentEditorTheme = d.editorThemes[0].value; d.currentFont = d.builtinFonts[0].value; d.currentSize = d.sizeOption[1].value; - d.currentColor = d.colorOption[1].value; + d.currentColor = d.colorOption[0].value; return d; }, mounted() { diff --git a/assets/scripts/themes/default-theme.js b/assets/scripts/themes/default-theme.js index 94c9e0e..b75e560 100644 --- a/assets/scripts/themes/default-theme.js +++ b/assets/scripts/themes/default-theme.js @@ -16,7 +16,7 @@ let default_theme = { 'display': 'table', 'margin': '2em auto 1em', 'padding': '0 1em', - 'border-bottom': '2px solid rgba(255, 95, 46, 0.9)' + 'border-bottom': '2px solid rgba(15, 76, 129, 0.9)' }, // 二级标题样式 @@ -27,7 +27,7 @@ let default_theme = { 'display': 'table', 'margin': '4em auto 2em', 'padding': '0 0.2em', - 'background': 'rgba(255, 95, 46, 0.9)', + 'background': 'rgba(15, 76, 129, 0.9)', 'color': '#fff' }, @@ -38,7 +38,7 @@ let default_theme = { 'margin': '2em 8px 0.75em 0', 'line-height': '1.2', 'padding-left': '8px', - 'border-left': '3px solid rgba(255, 95, 46, 0.9)' + 'border-left': '3px solid rgba(15, 76, 129, 0.9)' }, // 四级标题样式 @@ -144,7 +144,7 @@ let default_theme = { // 字体加粗样式 strong: { - 'color': 'rgba(255, 95, 46, 0.9)', + 'color': 'rgba(15, 76, 129, 0.9)', 'font-weight': 'bold', },