mirror of
https://github.com/vrtmrz/obsidian-livesync.git
synced 2025-12-21 21:51:30 +00:00
Merge pull request #716 from chriscross12324/bugfix/setting-panel-hierarchy
bugfix/setting-panel-hierarchy: Fixed visual inconsistencies
This commit is contained in:
@@ -21,7 +21,7 @@ export function paneCustomisationSync(
|
|||||||
text: "Please set device name to identify this device. This name should be unique among your devices. While not configured, we cannot enable this feature.",
|
text: "Please set device name to identify this device. This name should be unique among your devices. While not configured, we cannot enable this feature.",
|
||||||
cls: "op-warn",
|
cls: "op-warn",
|
||||||
},
|
},
|
||||||
(c) => {},
|
(c) => { },
|
||||||
visibleOnly(() => this.isConfiguredAs("deviceAndVaultName", ""))
|
visibleOnly(() => this.isConfiguredAs("deviceAndVaultName", ""))
|
||||||
);
|
);
|
||||||
this.createEl(
|
this.createEl(
|
||||||
@@ -31,7 +31,7 @@ export function paneCustomisationSync(
|
|||||||
text: "We cannot change the device name while this feature is enabled. Please disable this feature to change the device name.",
|
text: "We cannot change the device name while this feature is enabled. Please disable this feature to change the device name.",
|
||||||
cls: "op-warn-info",
|
cls: "op-warn-info",
|
||||||
},
|
},
|
||||||
(c) => {},
|
(c) => { },
|
||||||
visibleOnly(() => this.isConfiguredAs("usePluginSync", true))
|
visibleOnly(() => this.isConfiguredAs("usePluginSync", true))
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|||||||
@@ -168,7 +168,7 @@ ${stringifyYaml(responseConfig)}
|
|||||||
${stringifyYaml({
|
${stringifyYaml({
|
||||||
version: this.manifestVersion,
|
version: this.manifestVersion,
|
||||||
...pluginConfig,
|
...pluginConfig,
|
||||||
})}`;
|
})}`;
|
||||||
console.log(msgConfig);
|
console.log(msgConfig);
|
||||||
await navigator.clipboard.writeText(msgConfig);
|
await navigator.clipboard.writeText(msgConfig);
|
||||||
Logger(
|
Logger(
|
||||||
|
|||||||
@@ -98,7 +98,7 @@ export function paneMaintenance(
|
|||||||
);
|
);
|
||||||
});
|
});
|
||||||
|
|
||||||
void addPanel(paneEl, "Syncing", () => {}, this.onlyOnCouchDBOrMinIO).then((paneEl) => {
|
void addPanel(paneEl, "Syncing", () => { }, this.onlyOnCouchDBOrMinIO).then((paneEl) => {
|
||||||
new Setting(paneEl)
|
new Setting(paneEl)
|
||||||
.setName("Resend")
|
.setName("Resend")
|
||||||
.setDesc("Resend all chunks to the remote.")
|
.setDesc("Resend all chunks to the remote.")
|
||||||
@@ -283,7 +283,7 @@ export function paneMaintenance(
|
|||||||
.addOnUpdate(this.onlyOnCouchDB);
|
.addOnUpdate(this.onlyOnCouchDB);
|
||||||
});
|
});
|
||||||
|
|
||||||
void addPanel(paneEl, "Total Overhaul", () => {}, this.onlyOnCouchDBOrMinIO).then((paneEl) => {
|
void addPanel(paneEl, "Total Overhaul", () => { }, this.onlyOnCouchDBOrMinIO).then((paneEl) => {
|
||||||
new Setting(paneEl)
|
new Setting(paneEl)
|
||||||
.setName("Rebuild everything")
|
.setName("Rebuild everything")
|
||||||
.setDesc("Rebuild local and remote database with local files.")
|
.setDesc("Rebuild local and remote database with local files.")
|
||||||
@@ -307,7 +307,7 @@ export function paneMaintenance(
|
|||||||
})
|
})
|
||||||
);
|
);
|
||||||
});
|
});
|
||||||
void addPanel(paneEl, "Rebuilding Operations (Remote Only)", () => {}, this.onlyOnCouchDBOrMinIO).then((paneEl) => {
|
void addPanel(paneEl, "Rebuilding Operations (Remote Only)", () => { }, this.onlyOnCouchDBOrMinIO).then((paneEl) => {
|
||||||
new Setting(paneEl)
|
new Setting(paneEl)
|
||||||
.setName("Perform cleanup")
|
.setName("Perform cleanup")
|
||||||
.setDesc(
|
.setDesc(
|
||||||
|
|||||||
@@ -321,6 +321,8 @@ export function paneRemoteConfig(
|
|||||||
},
|
},
|
||||||
onUpdate: this.enableOnlySyncDisabled,
|
onUpdate: this.enableOnlySyncDisabled,
|
||||||
});
|
});
|
||||||
|
});
|
||||||
|
|
||||||
void addPanel(paneEl, "Peer-to-Peer", undefined, this.onlyOnOnlyP2P).then((paneEl) => {
|
void addPanel(paneEl, "Peer-to-Peer", undefined, this.onlyOnOnlyP2P).then((paneEl) => {
|
||||||
const syncWarnP2P = this.createEl(paneEl, "div", {
|
const syncWarnP2P = this.createEl(paneEl, "div", {
|
||||||
text: "",
|
text: "",
|
||||||
@@ -512,7 +514,7 @@ The pane also can be launched by \`P2P Replicator\` command from the Command Pal
|
|||||||
paneEl,
|
paneEl,
|
||||||
"div",
|
"div",
|
||||||
{ text: "" },
|
{ text: "" },
|
||||||
(el) => {},
|
(el) => { },
|
||||||
visibleOnly(() => this.editingSettings.useJWT)
|
visibleOnly(() => this.editingSettings.useJWT)
|
||||||
);
|
);
|
||||||
|
|
||||||
@@ -595,8 +597,7 @@ The pane also can be launched by \`P2P Replicator\` command from the Command Pal
|
|||||||
.addOnUpdate(this.onlyOnCouchDB);
|
.addOnUpdate(this.onlyOnCouchDB);
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
});
|
void addPanel(paneEl, $msg("obsidianLiveSyncSettingTab.titleNotification"), () => { }, this.onlyOnCouchDB).then(
|
||||||
void addPanel(paneEl, $msg("obsidianLiveSyncSettingTab.titleNotification"), () => {}, this.onlyOnCouchDB).then(
|
|
||||||
(paneEl) => {
|
(paneEl) => {
|
||||||
paneEl.addClass("wizardHidden");
|
paneEl.addClass("wizardHidden");
|
||||||
new Setting(paneEl).autoWireNumeric("notifyThresholdOfRemoteStorageSize", {}).setClass("wizardHidden");
|
new Setting(paneEl).autoWireNumeric("notifyThresholdOfRemoteStorageSize", {}).setClass("wizardHidden");
|
||||||
|
|||||||
22
styles.css
22
styles.css
@@ -110,10 +110,10 @@
|
|||||||
div.sls-setting-menu-btn {
|
div.sls-setting-menu-btn {
|
||||||
color: var(--text-normal);
|
color: var(--text-normal);
|
||||||
background-color: var(--background-secondary-alt);
|
background-color: var(--background-secondary-alt);
|
||||||
border-radius: 4px 4px 0 0;
|
border-radius: 8px;
|
||||||
padding: 6px 10px;
|
padding: 6px 10px;
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
margin-right: 12px;
|
margin-right: 2px;
|
||||||
font-family: "Inter", sans-serif;
|
font-family: "Inter", sans-serif;
|
||||||
outline: none;
|
outline: none;
|
||||||
user-select: none;
|
user-select: none;
|
||||||
@@ -140,9 +140,9 @@ div.sls-setting-menu-btn {
|
|||||||
flex-grow: 1;
|
flex-grow: 1;
|
||||||
position: sticky;
|
position: sticky;
|
||||||
top: 0;
|
top: 0;
|
||||||
background-color: rgba(var(--background-primary), 0.3);
|
backdrop-filter: blur(15px);
|
||||||
backdrop-filter: blur(4px);
|
padding: 4px;
|
||||||
border-radius: 4px;
|
border-radius: 10px;
|
||||||
z-index: 10;
|
z-index: 10;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -437,13 +437,11 @@ div.workspace-leaf-content[data-type=bases] .livesync-status {
|
|||||||
|
|
||||||
.sls-setting-panel-title {
|
.sls-setting-panel-title {
|
||||||
position: sticky;
|
position: sticky;
|
||||||
}
|
font-size: medium;
|
||||||
|
top: 2.5em;
|
||||||
.sls-setting-panel-title {
|
background-color: var(--background-secondary-alt);
|
||||||
top: 2em;
|
border-radius: 10px;
|
||||||
background-color: rgba(var(--background-primary), 0.3);
|
padding: 0.5em 1.0em;
|
||||||
backdrop-filter: blur(4px);
|
|
||||||
border-radius: 30%;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.sls-dialogue-note-wrapper {
|
.sls-dialogue-note-wrapper {
|
||||||
|
|||||||
Reference in New Issue
Block a user