diff --git a/packages/server/public/css/items/note.css b/packages/server/public/css/items/note.css index 841c7bc41..ea6d15922 100644 --- a/packages/server/public/css/items/note.css +++ b/packages/server/public/css/items/note.css @@ -14,6 +14,8 @@ max-width: 840px; margin-left: auto; margin-right: auto; + padding-left: 1.5em; + padding-right: 1.5em; } .page-note .last-updated { diff --git a/packages/server/public/css/main.css b/packages/server/public/css/main.css index 4fa68a853..af1dd7f3d 100644 --- a/packages/server/public/css/main.css +++ b/packages/server/public/css/main.css @@ -51,4 +51,9 @@ table.table th .sort-button i { .footer .content { opacity: 0.5; -} \ No newline at end of file +} + +ul li { + list-style-type: disc; +} + diff --git a/packages/server/src/services/MustacheService.ts b/packages/server/src/services/MustacheService.ts index 2a5398bdf..fc28975ba 100644 --- a/packages/server/src/services/MustacheService.ts +++ b/packages/server/src/services/MustacheService.ts @@ -16,6 +16,7 @@ export interface View { name: string; title: string; path: string; + layout?: string; navbar?: boolean; content?: any; partials?: string[]; @@ -76,8 +77,9 @@ export default class MustacheService { this.prefersDarkEnabled_ = v; } - private get defaultLayoutPath(): string { - return `${config().layoutDir}/default.mustache`; + private layoutPath(name: string): string { + if (!name) name = 'default'; + return `${config().layoutDir}/${name}.mustache`; } private get defaultLayoutOptions(): GlobalParams { @@ -142,7 +144,7 @@ export default class MustacheService { ...view.content, }; - return Mustache.render(await this.loadTemplateContent(this.defaultLayoutPath), layoutView, this.partials_); + return Mustache.render(await this.loadTemplateContent(this.layoutPath(view.layout)), layoutView, this.partials_); } } diff --git a/packages/server/src/views/layouts/basic.mustache b/packages/server/src/views/layouts/basic.mustache new file mode 100644 index 000000000..9ec11108f --- /dev/null +++ b/packages/server/src/views/layouts/basic.mustache @@ -0,0 +1,22 @@ + + + + {{pageTitle}} + + + {{#cssFiles}} + + {{/cssFiles}} + {{#jsFiles}} + + {{/jsFiles}} + + +
+
+ {{{contentHtml}}} +
+
+ {{> footer}} + + \ No newline at end of file