mirror of
https://github.com/zadam/trilium.git
synced 2025-11-01 10:55:55 +01:00
Compare commits
4 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
21e77c83fc | ||
|
|
b0310e34e2 | ||
|
|
761c51069a | ||
|
|
4dc285d84f |
2
package-lock.json
generated
2
package-lock.json
generated
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "trilium",
|
"name": "trilium",
|
||||||
"version": "0.37.6",
|
"version": "0.37.7",
|
||||||
"lockfileVersion": 1,
|
"lockfileVersion": 1,
|
||||||
"requires": true,
|
"requires": true,
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
"name": "trilium",
|
"name": "trilium",
|
||||||
"productName": "Trilium Notes",
|
"productName": "Trilium Notes",
|
||||||
"description": "Trilium Notes",
|
"description": "Trilium Notes",
|
||||||
"version": "0.37.7",
|
"version": "0.37.8",
|
||||||
"license": "AGPL-3.0-only",
|
"license": "AGPL-3.0-only",
|
||||||
"main": "electron.js",
|
"main": "electron.js",
|
||||||
"bin": {
|
"bin": {
|
||||||
|
|||||||
@@ -78,7 +78,7 @@ window.onerror = function (msg, url, lineNo, columnNo, error) {
|
|||||||
};
|
};
|
||||||
|
|
||||||
for (const appCssNoteId of window.appCssNoteIds) {
|
for (const appCssNoteId of window.appCssNoteIds) {
|
||||||
cssLoader.requireCss(`/api/notes/download/${appCssNoteId}`);
|
cssLoader.requireCss(`api/notes/download/${appCssNoteId}`);
|
||||||
}
|
}
|
||||||
|
|
||||||
const wikiBaseUrl = "https://github.com/zadam/trilium/wiki/";
|
const wikiBaseUrl = "https://github.com/zadam/trilium/wiki/";
|
||||||
|
|||||||
@@ -131,7 +131,7 @@ export default class ApperanceOptions {
|
|||||||
if (noteId) {
|
if (noteId) {
|
||||||
// make sure the CSS is loaded
|
// make sure the CSS is loaded
|
||||||
// if the CSS has been loaded and then updated then the changes won't take effect though
|
// if the CSS has been loaded and then updated then the changes won't take effect though
|
||||||
cssLoader.requireCss(`/api/notes/download/${noteId}`);
|
cssLoader.requireCss(`api/notes/download/${noteId}`);
|
||||||
}
|
}
|
||||||
|
|
||||||
this.$body.addClass("theme-" + newTheme);
|
this.$body.addClass("theme-" + newTheme);
|
||||||
|
|||||||
@@ -464,9 +464,10 @@ button.icon-button {
|
|||||||
margin: auto;
|
margin: auto;
|
||||||
/* setting the display to block since "table" doesn't support scrolling */
|
/* setting the display to block since "table" doesn't support scrolling */
|
||||||
display: block;
|
display: block;
|
||||||
flex-basis: content;
|
/** flex-basis: content; - use once "content" is implemented by chrome */
|
||||||
flex-shrink: 1;
|
flex-shrink: 0;
|
||||||
flex-grow: 0;
|
flex-grow: 0;
|
||||||
|
max-height: 30%;
|
||||||
overflow: auto;
|
overflow: auto;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1 +1 @@
|
|||||||
module.exports = { buildDate:"2019-12-02T23:09:42+01:00", buildRevision: "6ba3e5ab7f866ac93ecbb48883dabf61723cde98" };
|
module.exports = { buildDate:"2019-12-03T22:31:20+01:00", buildRevision: "b0310e34e2c6f023cc8190310ff63d840157f6cc" };
|
||||||
|
|||||||
@@ -2,6 +2,7 @@
|
|||||||
<html lang="en">
|
<html lang="en">
|
||||||
<head>
|
<head>
|
||||||
<meta charset="utf-8">
|
<meta charset="utf-8">
|
||||||
|
<link rel="shortcut icon" href="favicon.ico">
|
||||||
<title>Trilium Notes</title>
|
<title>Trilium Notes</title>
|
||||||
</head>
|
</head>
|
||||||
<body class="desktop theme-<%= theme %>" style="--main-font-size: <%= mainFontSize %>%; --tree-font-size: <%= treeFontSize %>%; --detail-font-size: <%= detailFontSize %>%;">
|
<body class="desktop theme-<%= theme %>" style="--main-font-size: <%= mainFontSize %>%; --tree-font-size: <%= treeFontSize %>%; --detail-font-size: <%= detailFontSize %>%;">
|
||||||
|
|||||||
Reference in New Issue
Block a user