mirror of
				https://github.com/zadam/trilium.git
				synced 2025-11-04 05:28:59 +01:00 
			
		
		
		
	cleanup after update check merge
This commit is contained in:
		
							parent
							
								
									364ac331da
								
							
						
					
					
						commit
						242977c7a5
					
				@ -1,7 +1,6 @@
 | 
				
			|||||||
import server from "../../services/server.js";
 | 
					import server from "../../services/server.js";
 | 
				
			||||||
import utils from "../../services/utils.js";
 | 
					import utils from "../../services/utils.js";
 | 
				
			||||||
import appContext from "../../services/app_context.js";
 | 
					import appContext from "../../services/app_context.js";
 | 
				
			||||||
import convertUtils from "../../services/convert_utils.js";
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
const FONT_FAMILIES = [
 | 
					const FONT_FAMILIES = [
 | 
				
			||||||
    { value: "theme", label: "Theme defined" },
 | 
					    { value: "theme", label: "Theme defined" },
 | 
				
			||||||
@ -29,12 +28,6 @@ const FONT_FAMILIES = [
 | 
				
			|||||||
];
 | 
					];
 | 
				
			||||||
 | 
					
 | 
				
			||||||
const TPL = `
 | 
					const TPL = `
 | 
				
			||||||
<style>
 | 
					 | 
				
			||||||
    .disabled-form-label {
 | 
					 | 
				
			||||||
        opacity: 0.5;
 | 
					 | 
				
			||||||
    }
 | 
					 | 
				
			||||||
</style>
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
<p><strong>Settings on this options tab are saved automatically after each change.</strong></p>
 | 
					<p><strong>Settings on this options tab are saved automatically after each change.</strong></p>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
<form>
 | 
					<form>
 | 
				
			||||||
 | 
				
			|||||||
@ -45,7 +45,6 @@ import EditedNotesWidget from "../widgets/ribbon_widgets/edited_notes.js";
 | 
				
			|||||||
import OpenNoteButtonWidget from "../widgets/buttons/open_note_button_widget.js";
 | 
					import OpenNoteButtonWidget from "../widgets/buttons/open_note_button_widget.js";
 | 
				
			||||||
import MermaidWidget from "../widgets/mermaid.js";
 | 
					import MermaidWidget from "../widgets/mermaid.js";
 | 
				
			||||||
import BookmarkButtons from "../widgets/bookmark_buttons.js";
 | 
					import BookmarkButtons from "../widgets/bookmark_buttons.js";
 | 
				
			||||||
import UpdateAvailableWidget from "../widgets/buttons/update_available.js";
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
export default class DesktopLayout {
 | 
					export default class DesktopLayout {
 | 
				
			||||||
    constructor(customWidgets) {
 | 
					    constructor(customWidgets) {
 | 
				
			||||||
 | 
				
			|||||||
@ -1,7 +0,0 @@
 | 
				
			|||||||
function parseBoolean(value) {
 | 
					 | 
				
			||||||
    return value.toLowerCase() === "true";
 | 
					 | 
				
			||||||
}
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
export default {
 | 
					 | 
				
			||||||
    parseBoolean
 | 
					 | 
				
			||||||
}
 | 
					 | 
				
			||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user