diff --git a/.husky/prepare-commit-msg b/.husky/prepare-commit-msg index c19c821..2c9d9b3 100755 --- a/.husky/prepare-commit-msg +++ b/.husky/prepare-commit-msg @@ -1,4 +1,14 @@ #!/bin/sh . "$(dirname "$0")/_/husky.sh" +if [ "$2" = "message" ]; then + echo "Skipping prepare-commit-msg hook due to message." + exit 0 +fi + +if [ "$2" = "commit" ]; then + echo "Skipping prepare-commit-msg hook due to amend." + exit 0 +fi + exec -
- -
+ + + + + diff --git a/components/buttons/nextDiff.vue b/components/buttons/nextDiff.vue index b04b203..54cb927 100644 --- a/components/buttons/nextDiff.vue +++ b/components/buttons/nextDiff.vue @@ -2,24 +2,7 @@
diff --git a/pages/v1/diff.vue b/pages/v1/diff.vue index 1a4adc2..fc3b241 100644 --- a/pages/v1/diff.vue +++ b/pages/v1/diff.vue @@ -5,15 +5,7 @@
- +
- +
-
+

{{ lhsLabel }}

{{ rhsLabel }}

@@ -79,6 +69,7 @@ export default Vue.extend({ lhsLabel: '', monacoDiffEditor: {}, diffNavigator: {}, + isSideBySideDiff: true, } }, head() { @@ -145,6 +136,12 @@ export default Vue.extend({ } }) }, + methods: { + toggleDiffFashion(value: boolean) { + this.monacoDiffEditor?.updateOptions?.({ renderSideBySide: value }) + this.isSideBySideDiff = value + }, + }, }) diff --git a/pages/v2/index.vue b/pages/v2/index.vue index 85441d5..4f0e6b9 100644 --- a/pages/v2/index.vue +++ b/pages/v2/index.vue @@ -2,7 +2,13 @@
- +
@@ -37,18 +43,7 @@ aria-label="Beautify entered text" type="button" title="Beautify" - class=" - absolute - p-2 - transition-all - rounded-sm - top-16 - right-3 - aspect-square - dark:hover:bg-slate-600 dark:bg-slate-600/50 - hover:bg-slate-300 - bg-gray-300/50 - " + class="absolute p-2 transition-all rounded-sm top-16 right-3 aspect-square dark:hover:bg-slate-600 dark:bg-slate-600/50 hover:bg-slate-300 bg-gray-300/50" @click=" lhsEditor.trigger('editor', 'editor.action.formatDocument') " @@ -77,18 +72,7 @@ aria-label="Beautify entered text" type="button" title="Beautify" - class=" - absolute - p-2 - transition-all - rounded-sm - top-16 - right-3 - aspect-square - dark:hover:bg-slate-600 dark:bg-slate-600/50 - hover:bg-slate-300 - bg-gray-300/50 - " + class="absolute p-2 transition-all rounded-sm top-16 right-3 aspect-square dark:hover:bg-slate-600 dark:bg-slate-600/50 hover:bg-slate-300 bg-gray-300/50" @click=" rhsEditor.trigger('editor', 'editor.action.formatDocument') " @@ -100,24 +84,7 @@