From f2ca0ff3d04a5ba8375fbd74cc3b1089bda77156 Mon Sep 17 00:00:00 2001 From: hiro Date: Thu, 7 Jun 2018 11:01:39 +0900 Subject: [PATCH 1/9] =?UTF-8?q?add:=20Robot=20/=20Material=20Icons?= =?UTF-8?q?=E3=81=AECDN=E3=82=92=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/index.ejs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/index.ejs b/src/index.ejs index 62c1823..35dbf21 100644 --- a/src/index.ejs +++ b/src/index.ejs @@ -9,6 +9,7 @@ require('module').globalPaths.push('<%= htmlWebpackPlugin.options.nodeModules.replace(/\\/g, '\\\\') %>') <% } %> +
From 67ede06f71335f0ded79603bb630c74bcfe36b79 Mon Sep 17 00:00:00 2001 From: hiro Date: Thu, 7 Jun 2018 11:02:28 +0900 Subject: [PATCH 2/9] fix: Open Sans -> Roboto --- src/renderer/assets/style/common/_variables.scss | 2 +- src/renderer/assets/style/plugin/_github-markdown.scss | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/renderer/assets/style/common/_variables.scss b/src/renderer/assets/style/common/_variables.scss index 8b140b7..617de62 100644 --- a/src/renderer/assets/style/common/_variables.scss +++ b/src/renderer/assets/style/common/_variables.scss @@ -2,7 +2,7 @@ // Font // ------------------------- $font-family-sansSerif: -apple-system, BlinkMacSystemFont, "Noto Sans JP", YuGothic, "Yu Gothic", "游ゴシック体", "游ゴシック", "ヒラギノ角ゴ ProN W3", "Hiragino Kaku Gothic ProN", "メイリオ", Meiryo, Emoji, sans-serif !default; -$font-family-monospace: "Source Code Pro", #{$font-family-sansSerif}, Emoji, monospace !default; +$font-family-monospace: Roboto, #{$font-family-sansSerif}, Emoji, monospace !default; $font-weight-base: normal; $font-size-base: 16px; diff --git a/src/renderer/assets/style/plugin/_github-markdown.scss b/src/renderer/assets/style/plugin/_github-markdown.scss index 5485421..7bcd018 100644 --- a/src/renderer/assets/style/plugin/_github-markdown.scss +++ b/src/renderer/assets/style/plugin/_github-markdown.scss @@ -147,7 +147,7 @@ .markdown-body code, .markdown-body kbd, .markdown-body pre { - font-family: monospace, monospace; + font-family: $font-family-monospace, monospace; font-size: 1em; } @@ -312,7 +312,6 @@ .markdown-body pre { margin-top: 0; margin-bottom: 0; - font: 12px Consolas, "Liberation Mono", Menlo, Courier, monospace; } .markdown-body .octicon { @@ -653,7 +652,6 @@ .markdown-body kbd { display: inline-block; padding: 3px 5px; - font: 11px Consolas, "Liberation Mono", Menlo, Courier, monospace; line-height: 10px; color: #555; vertical-align: middle; From aaa4e657baf711eb6ba7bf94c38bac7a821f98b6 Mon Sep 17 00:00:00 2001 From: hiro Date: Thu, 7 Jun 2018 16:48:48 +0900 Subject: [PATCH 3/9] add: vue-material --- package-lock.json | 5 +++++ package.json | 1 + src/renderer/main.js | 4 ++++ 3 files changed, 10 insertions(+) diff --git a/package-lock.json b/package-lock.json index e77a7c9..5bbaa62 100644 --- a/package-lock.json +++ b/package-lock.json @@ -14494,6 +14494,11 @@ } } }, + "vue-material": { + "version": "1.0.0-beta-10.2", + "resolved": "https://registry.npmjs.org/vue-material/-/vue-material-1.0.0-beta-10.2.tgz", + "integrity": "sha512-DXOUXm6M8zbeJ6LPvP1h/0EhXmCkxNGz2dM/0q4w+lsT9uTaos+YDrwQvJBJcxil3fEw6oHCfhG/peWks+8v7Q==" + }, "vue-router": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-3.0.1.tgz", diff --git a/package.json b/package.json index 14b2403..b521f02 100644 --- a/package.json +++ b/package.json @@ -34,6 +34,7 @@ "lodash": "^4.17.10", "vue": "^2.5.16", "vue-electron": "^1.0.6", + "vue-material": "^1.0.0-beta-10.2", "vue-router": "^3.0.1", "vuex": "^3.0.1" }, diff --git a/src/renderer/main.js b/src/renderer/main.js index 2afbc35..7e42b49 100644 --- a/src/renderer/main.js +++ b/src/renderer/main.js @@ -4,6 +4,10 @@ import App from './App'; import router from './router'; import store from './store'; +import VueMaterial from 'vue-material'; +import 'vue-material/dist/vue-material.min.css'; +Vue.use(VueMaterial); + import VueCodeMirror from 'vue-codemirror'; Vue.use(VueCodeMirror); From 98fa700cbbf9193e78f83575d3db92877e2f8d20 Mon Sep 17 00:00:00 2001 From: hiro Date: Thu, 7 Jun 2018 16:49:31 +0900 Subject: [PATCH 4/9] =?UTF-8?q?WIP:=20Toolbar=E3=82=92=E4=BB=AE=E5=AE=9F?= =?UTF-8?q?=E8=A3=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/renderer/components/Editor.vue | 12 ++ src/renderer/components/Main.vue | 10 +- src/renderer/components/Toolbar.vue | 270 +++++++--------------------- 3 files changed, 80 insertions(+), 212 deletions(-) diff --git a/src/renderer/components/Editor.vue b/src/renderer/components/Editor.vue index d4472f4..7104f0e 100644 --- a/src/renderer/components/Editor.vue +++ b/src/renderer/components/Editor.vue @@ -41,6 +41,12 @@ export default { editor() { return this.$refs.editor.codemirror; }, + canUndo() { + return this.$refs.editor.codemirror.historySize().undo > 0; + }, + canRedo() { + return this.$refs.editor.codemirror.historySize().redo > 0; + }, ...mapState({ path: state => state.Editor.filePath, isPreview: state => state.Editor.isPreview, @@ -73,6 +79,12 @@ export default { this.input = this.markdown.render(newCode); } }, 200), + undo() { + this.editor.undo(); + }, + redo() { + this.editor.redo(); + }, openDialog(type, msg) { const remote = this.$electron.remote; const dialog = remote.dialog; diff --git a/src/renderer/components/Main.vue b/src/renderer/components/Main.vue index 803bb51..455b4bf 100644 --- a/src/renderer/components/Main.vue +++ b/src/renderer/components/Main.vue @@ -1,21 +1,25 @@ diff --git a/src/renderer/components/Toolbar.vue b/src/renderer/components/Toolbar.vue index f2d96c8..59ce9e9 100644 --- a/src/renderer/components/Toolbar.vue +++ b/src/renderer/components/Toolbar.vue @@ -1,231 +1,83 @@ - From 538bcf93539a57ddc7ffe55420e9d1fdce815d28 Mon Sep 17 00:00:00 2001 From: hiro0218 Date: Fri, 8 Jun 2018 00:35:28 +0900 Subject: [PATCH 5/9] =?UTF-8?q?fix:=20undo/redo=E3=83=9C=E3=82=BF=E3=83=B3?= =?UTF-8?q?=E3=82=92=E7=8A=B6=E6=85=8B=E3=81=AB=E5=BF=9C=E3=81=98=E3=81=9F?= =?UTF-8?q?=E3=82=B9=E3=82=BF=E3=82=A4=E3=83=AB=E3=81=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/renderer/components/Editor.vue | 20 +++++++++++++------- src/renderer/components/Toolbar.vue | 23 ++++++++--------------- src/renderer/store/modules/Editor.js | 14 ++++++++++++++ 3 files changed, 35 insertions(+), 22 deletions(-) diff --git a/src/renderer/components/Editor.vue b/src/renderer/components/Editor.vue index 7104f0e..150396e 100644 --- a/src/renderer/components/Editor.vue +++ b/src/renderer/components/Editor.vue @@ -4,7 +4,8 @@ + @input="onEditorCodeChange" + @changes="checkEditorHistory"/>
@@ -41,12 +42,6 @@ export default { editor() { return this.$refs.editor.codemirror; }, - canUndo() { - return this.$refs.editor.codemirror.historySize().undo > 0; - }, - canRedo() { - return this.$refs.editor.codemirror.historySize().redo > 0; - }, ...mapState({ path: state => state.Editor.filePath, isPreview: state => state.Editor.isPreview, @@ -70,6 +65,11 @@ export default { this.openLinkExternal(); }, methods: { + checkEditorHistory() { + let { undo, redo } = this.editor.historySize(); + this.$store.dispatch('setCanUndo', undo > 0); + this.$store.dispatch('setCanRedo', redo > 0); + }, togglePreview() { this.$store.dispatch('updateIsPreview', !this.isPreview); }, @@ -85,6 +85,12 @@ export default { redo() { this.editor.redo(); }, + canUndo() { + return this.editor.historySize().undo > 0; + }, + canRedo() { + return this.editor.historySize().redo > 0; + }, openDialog(type, msg) { const remote = this.$electron.remote; const dialog = remote.dialog; diff --git a/src/renderer/components/Toolbar.vue b/src/renderer/components/Toolbar.vue index 59ce9e9..f0d8756 100644 --- a/src/renderer/components/Toolbar.vue +++ b/src/renderer/components/Toolbar.vue @@ -1,13 +1,13 @@