From 7b9ee0abde6c5df8c7bb6990f338cc3618f64907 Mon Sep 17 00:00:00 2001 From: Oleg Date: Sat, 24 Sep 2022 10:41:46 +0300 Subject: [PATCH 1/2] 0.4.1 --- manifest.json | 2 +- package-lock.json | 4 ++-- package.json | 2 +- versions.json | 3 ++- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/manifest.json b/manifest.json index 86711ca..fd03cf7 100644 --- a/manifest.json +++ b/manifest.json @@ -1,7 +1,7 @@ { "id": "obsidian-bulk-rename-plugin", "name": "Bulk Rename", - "version": "0.4.0", + "version": "0.4.1", "minAppVersion": "0.15.0", "description": "Purpose of this plugin rename files based on pattern", "author": "Oleg Lustenko", diff --git a/package-lock.json b/package-lock.json index 69665a5..3f68012 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "obsidian-bulk-rename", - "version": "0.4.0", + "version": "0.4.1", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "obsidian-bulk-rename", - "version": "0.4.0", + "version": "0.4.1", "license": "MIT", "dependencies": { "@popperjs/core": "^2.11.2", diff --git a/package.json b/package.json index afb65aa..c5ff953 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "obsidian-bulk-rename", - "version": "0.4.0", + "version": "0.4.1", "description": "Purpose of this plugin rename files based on pattern", "main": "main.js", "scripts": { diff --git a/versions.json b/versions.json index c90c525..53f6718 100644 --- a/versions.json +++ b/versions.json @@ -16,5 +16,6 @@ "0.3.3": "0.15.0", "0.3.4": "0.15.0", "0.3.5": "0.15.0", - "0.4.0": "0.15.0" + "0.4.0": "0.15.0", + "0.4.1": "0.15.0" } \ No newline at end of file From d2b52e7bf8c40b213d9a5fbcb4e3866a29088cc7 Mon Sep 17 00:00:00 2001 From: Oleg Date: Sat, 1 Oct 2022 10:18:21 +0300 Subject: [PATCH 2/2] preview and regexp layout improvements --- main.ts | 10 +++---- src/components/DonateButton.ts | 2 +- src/components/RenderPreviewFiles.ts | 6 +++-- styles.css | 39 ++++++++++++++++++++++++++++ 4 files changed, 49 insertions(+), 8 deletions(-) diff --git a/main.ts b/main.ts index 45ab1e7..d137091 100644 --- a/main.ts +++ b/main.ts @@ -95,7 +95,7 @@ export class BulkRenameSettingsTab extends PluginSettingTab { display() { const { containerEl } = this; containerEl.empty(); - containerEl.createEl('h2', { text: 'Bulk Rename - Settings' }); + containerEl.createEl('h1', { text: 'Bulk Rename - Settings' }); containerEl.addEventListener('keyup', (event) => { if (event.key !== 'Enter') { return; @@ -116,9 +116,9 @@ export class BulkRenameSettingsTab extends PluginSettingTab { renderTabs() { new Setting(this.containerEl) - .setName('UI will be changed when you click those buttons') + .setName('Search by: ') .addButton((button) => { - button.setButtonText('Search by folder'); + button.setButtonText('Folder'); if (isViewTypeFolder(this.plugin.settings)) { button.setCta(); } @@ -129,7 +129,7 @@ export class BulkRenameSettingsTab extends PluginSettingTab { }); }) .addButton((button) => { - button.setButtonText('Search By Tags'); + button.setButtonText('Tags'); if (isViewTypeTags(this.plugin.settings)) { button.setCta(); } @@ -140,7 +140,7 @@ export class BulkRenameSettingsTab extends PluginSettingTab { }); }) .addButton((button) => { - button.setButtonText('Search by RegExp'); + button.setButtonText('RegExp'); if (isViewTypeRegExp(this.plugin.settings)) { button.setCta(); } diff --git a/src/components/DonateButton.ts b/src/components/DonateButton.ts index f87d3bf..1d15386 100644 --- a/src/components/DonateButton.ts +++ b/src/components/DonateButton.ts @@ -1,5 +1,5 @@ export const renderDonateButton = (containerEl: HTMLElement) => { - containerEl.createEl('h3', { text: 'Support development' }); + containerEl.createEl('h2', { text: 'Support development' }); const donateText = containerEl.createEl('p'); diff --git a/src/components/RenderPreviewFiles.ts b/src/components/RenderPreviewFiles.ts index 0d31151..f06ad53 100644 --- a/src/components/RenderPreviewFiles.ts +++ b/src/components/RenderPreviewFiles.ts @@ -25,7 +25,8 @@ export const renderPreviewFiles = ( const previewLabel = createPreviewElement(); text.inputEl.insertAdjacentElement('afterend', previewLabel); - text.inputEl.addClass('templater_cmd'); + text.inputEl.addClass('bulk_preview_textarea'); + text.inputEl.wrap = 'soft'; }) .addTextArea((text) => { text.setPlaceholder( @@ -36,7 +37,8 @@ export const renderPreviewFiles = ( replacedPreviewTextArea = text.inputEl; const value = getRenderedFileNamesReplaced(plugin); text.setValue(value); - text.inputEl.addClass('templater_cmd'); + text.inputEl.addClass('bulk_preview_textarea'); + text.inputEl.wrap = 'soft'; }) .then((setting) => { syncScrolls(existingFilesTextArea, replacedPreviewTextArea, state); diff --git a/styles.css b/styles.css index 3210dbf..4a6ed30 100644 --- a/styles.css +++ b/styles.css @@ -4,6 +4,21 @@ .bulk_rename_preview { width: 80%; + height: 100%; + gap: 0; +} + +.bulk_rename_preview > textarea { + height: 360px; +} + +.bulk_preview_textarea { + margin-left: 5px; + margin-right: 5px; + font-size: 14px; + width: 100%; + /*white-space: nowrap;*/ + /*overflow: auto;*/ } .bulk_button { @@ -25,11 +40,25 @@ } .bulk_regexp_control { + background: var(--background-modifier-form-field); border: 1px solid var(--background-modifier-border); + transition: box-shadow 0.15s ease-in-out, border 0.15s ease-in-out; + font-family: inherit; + border-radius: var(--input-radius); + outline: none; +} + +.bulk_regexp_control:hover, +.bulk_regexp_control:focus, +.bulk_regexp_control:focus-visible { + box-shadow: 0 0 0 2px var(--background-modifier-border-hover); + /*box-shadow: 0 0 0 2px var*/ } .bulk_regexp_control > input { border: none; + margin: 0; + padding: 0; } .bulk_regexp, @@ -37,8 +66,18 @@ width: 100%; } +.bulk_regexp:hover, +.bulk_regexp:focus, +.bulk_regexp:focus-visible .bulk_regexp_flags:hover, +.bulk_regexp_flags:focus, +.bulk_regexp_flags:focus-visible { + border: none !important; + box-shadow: none !important; +} + .bulk_regexp_flags { caret-color: transparent; + max-width: 80px; } .bulk_regexp_slash {