Update for v0.48.3

This commit is contained in:
Agatha Lovelace 2021-10-26 23:12:05 +03:00
parent 88d01be135
commit 953664d51f
7 changed files with 316 additions and 207 deletions

View File

@ -1,6 +1,6 @@
{ {
"formatVersion": 1, "formatVersion": 1,
"appVersion": "0.43.4", "appVersion": "0.48.3",
"files": [ "files": [
{ {
"isClone": false, "isClone": false,
@ -11,14 +11,14 @@
"title": "Witches Town", "title": "Witches Town",
"notePosition": 0, "notePosition": 0,
"prefix": null, "prefix": null,
"isExpanded": 1, "isExpanded": true,
"type": "code", "type": "code",
"mime": "text/css", "mime": "text/css",
"attributes": [ "attributes": [
{ {
"type": "label", "type": "label",
"name": "appTheme", "name": "appTheme",
"value": "", "value": "witches-town",
"isInheritable": false, "isInheritable": false,
"position": 10 "position": 10
} }
@ -36,7 +36,7 @@
"title": "fira-sans-v10-latin-regular.woff2", "title": "fira-sans-v10-latin-regular.woff2",
"notePosition": 0, "notePosition": 0,
"prefix": null, "prefix": null,
"isExpanded": 0, "isExpanded": false,
"type": "file", "type": "file",
"mime": "font/woff2", "mime": "font/woff2",
"attributes": [ "attributes": [
@ -55,7 +55,7 @@
"position": 20 "position": 20
} }
], ],
"dataFileName": "fira-sans-v10-latin-regular.woff2" "dataFileName": "fira-sans-v10-latin-regular.wo"
} }
] ]
}, },

View File

@ -2,7 +2,7 @@
A port of [Witches Town](https://github.com/wryk/witches-town-theme) theme for Trilium Notes with a few additional changes. A port of [Witches Town](https://github.com/wryk/witches-town-theme) theme for Trilium Notes with a few additional changes.
![Screenshot of Trilium Notes with theme enabled](https://i.imgur.com/JYOg9YC.png) ![Screenshot of Trilium Notes with theme enabled](https://i.imgur.com/2wNyvbe.png)
# Installation # Installation
@ -16,4 +16,4 @@ This program is free software: you can redistribute it and/or modify it under th
This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details.
You should have received a copy of the GNU Affero General Public License along with this program. If not, see https://www.gnu.org/licenses/. You should have received a copy of the GNU Affero General Public License along with this program. If not, see https://www.gnu.org/licenses/.

View File

@ -5,7 +5,9 @@
src: url('/custom/fonts/fira-sans.woff2') format('woff2'); src: url('/custom/fonts/fira-sans.woff2') format('woff2');
} }
body.theme-witches-town { :root {
--theme-style: dark;
--main-font-family: 'Fira Sans', sans-serif !important; --main-font-family: 'Fira Sans', sans-serif !important;
--main-font-size: normal; --main-font-size: normal;
--tree-font-family: inherit; --tree-font-family: inherit;
@ -17,11 +19,12 @@ body.theme-witches-town {
--main-background-color: #383144; --main-background-color: #383144;
--main-text-color: #D5BDD6; --main-text-color: #D5BDD6;
--main-border-color: #87778D; --main-border-color: #87778D;
--accented-background-color: #473E56; --accented-background-color: #473E56;
--more-accented-background-color: #DBD3FF; --more-accented-background-color: #383144;
--header-background-color: #383144;
--button-background-color: #473E56; --button-background-color: #473E56;
--button-disabled-background-color: #DBD3FF; --button-disabled-background-color: #383144;
--button-border-color: #87778D; --button-border-color: #87778D;
--button-text-color: #D5BDD6; --button-text-color: #D5BDD6;
--button-border-radius: 15px; --button-border-radius: 15px;
@ -42,22 +45,48 @@ body.theme-witches-town {
--modal-background-color: #383144; --modal-background-color: #383144;
--modal-backdrop-color: black; --modal-backdrop-color: black;
--scrollbar-border-color: #87778D; --scrollbar-border-color: #87778D;
--left-pane-background-color: #383144;
--left-pane-text-color: #D5BDD6;
--launcher-pane-background-color: #383144;
--launcher-pane-text-color: #D5BDD6;
--active-tab-background-color: #473E56;
--active-tab-text-color: #D5BDD6;
--inactive-tab-background-color: #383144;
--inactive-tab-text-color: #D5BDD6;
} }
body.theme-witches-town .note-detail-text { body .note-detail-text {
font-size: 120%; font-size: 120%;
} }
body.theme-witches-town .CodeMirror { body #launcher-pane div,
body #launcher-pane div *,
body #launcher-pane span {
background-color: var(--launcher-pane-background-color);
border-radius: 50%;
}
body #launcher-pane div:hover * {
background-color: var(--hover-item-background-color);
}
body #left-pane .btn:not(.btn-primary) {
background-color: var(--launcher-pane-background-color);
}
body .CodeMirror {
filter: invert(100%) hue-rotate(300deg) saturate(80%); filter: invert(100%) hue-rotate(300deg) saturate(80%);
/* background-color: #f7f8f6 !important; */ /* background-color: #f7f8f6 !important; */
} }
body.theme-witches-town .bx.icon-action { body .bx.icon-action {
border-radius: 50%; border-radius: 50%;
} }
body.theme-witches-town span.fancytree-node.done, body.theme-witches-town span.fancytree-node.todo{ body span.fancytree-node.done, body span.fancytree-node.todo{
filter: saturate(30%) brightness(180%); filter: saturate(30%) brightness(180%);
} }

View File

@ -2,6 +2,7 @@
<html> <html>
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
</head> </head>
<frameset cols="25%,75%"> <frameset cols="25%,75%">
<frame name="navigation" src="navigation.html"> <frame name="navigation" src="navigation.html">

View File

@ -9,7 +9,7 @@
<ul> <ul>
<li><a href="Witches%20Town.css" target="detail">Witches Town</a> <li><a href="Witches%20Town.css" target="detail">Witches Town</a>
<ul> <ul>
<li><a href="Witches%20Town/fira-sans-v10-latin-regular.woff2" target="detail">fira-sans-v10-latin-regular.woff2</a> <li><a href="Witches%20Town/fira-sans-v10-latin-regular.wo" target="detail">fira-sans-v10-latin-regular.woff2</a>
</li> </li>
</ul> </ul>
</li> </li>

459
style.css
View File

@ -1,18 +1,16 @@
/* !!!!!! TRILIUM CUSTOM CHANGES !!!!!! */ /* !!!!!! TRILIUM CUSTOM CHANGES !!!!!! */
.ck-widget__type-around { /* gets rid of triangles: https://github.com/zadam/trilium/issues/1129 */ .printed-content .ck-widget__selection-handle, .printed-content .ck-widget__type-around { /* gets rid of triangles: https://github.com/zadam/trilium/issues/1129 */
display: none; display: none;
} }
/*
* CKEditor 5 (v21.0.0) content styles.
* Generated on Wed, 29 Jul 2020 12:14:43 GMT.
* For more information, check out https://ckeditor.com/docs/ckeditor5/latest/builds/guides/integration/content-styles.html
*/
:root { :root {
--ck-color-image-caption-background: hsl(0, 0%, 97%);
--ck-color-image-caption-text: hsl(0, 0%, 20%);
--ck-color-mention-background: hsla(341, 100%, 30%, 0.1); --ck-color-mention-background: hsla(341, 100%, 30%, 0.1);
--ck-color-mention-text: hsl(341, 100%, 30%); --ck-color-mention-text: hsl(341, 100%, 30%);
--ck-color-table-caption-background: hsl(0, 0%, 97%);
--ck-color-table-caption-text: hsl(0, 0%, 20%);
--ck-highlight-marker-blue: hsl(201, 97%, 72%); --ck-highlight-marker-blue: hsl(201, 97%, 72%);
--ck-highlight-marker-green: hsl(120, 93%, 68%); --ck-highlight-marker-green: hsl(120, 93%, 68%);
--ck-highlight-marker-pink: hsl(345, 96%, 73%); --ck-highlight-marker-pink: hsl(345, 96%, 73%);
@ -20,47 +18,61 @@
--ck-highlight-pen-green: hsl(112, 100%, 27%); --ck-highlight-pen-green: hsl(112, 100%, 27%);
--ck-highlight-pen-red: hsl(0, 85%, 49%); --ck-highlight-pen-red: hsl(0, 85%, 49%);
--ck-image-style-spacing: 1.5em; --ck-image-style-spacing: 1.5em;
--ck-inline-image-style-spacing: calc(var(--ck-image-style-spacing) / 2);
--ck-todo-list-checkmark-size: 16px; --ck-todo-list-checkmark-size: 16px;
} }
/* ckeditor5-image/theme/image.css */ /* ckeditor5-highlight/theme/highlight.css */
.ck-content .image { .ck-content .marker-yellow {
display: table; background-color: var(--ck-highlight-marker-yellow);
clear: both;
text-align: center;
margin: 1em auto;
} }
/* ckeditor5-image/theme/image.css */ /* ckeditor5-highlight/theme/highlight.css */
.ck-content .image img { .ck-content .marker-green {
display: block; background-color: var(--ck-highlight-marker-green);
margin: 0 auto;
max-width: 100%;
min-width: 50px;
} }
/* ckeditor5-image/theme/imagecaption.css */ /* ckeditor5-highlight/theme/highlight.css */
.ck-content .image > figcaption { .ck-content .marker-pink {
display: table-caption; background-color: var(--ck-highlight-marker-pink);
caption-side: bottom;
word-break: break-word;
color: hsl(0, 0%, 20%);
background-color: hsl(0, 0%, 97%);
padding: .6em;
font-size: .75em;
outline-offset: -1px;
} }
/* ckeditor5-image/theme/imageresize.css */ /* ckeditor5-highlight/theme/highlight.css */
.ck-content .image.image_resized { .ck-content .marker-blue {
max-width: 100%; background-color: var(--ck-highlight-marker-blue);
display: block;
box-sizing: border-box;
} }
/* ckeditor5-image/theme/imageresize.css */ /* ckeditor5-highlight/theme/highlight.css */
.ck-content .image.image_resized img { .ck-content .pen-red {
width: 100%; color: var(--ck-highlight-pen-red);
background-color: transparent;
} }
/* ckeditor5-image/theme/imageresize.css */ /* ckeditor5-highlight/theme/highlight.css */
.ck-content .image.image_resized > figcaption { .ck-content .pen-green {
display: block; color: var(--ck-highlight-pen-green);
background-color: transparent;
}
/* ckeditor5-font/theme/fontsize.css */
.ck-content .text-tiny {
font-size: .7em;
}
/* ckeditor5-font/theme/fontsize.css */
.ck-content .text-small {
font-size: .85em;
}
/* ckeditor5-font/theme/fontsize.css */
.ck-content .text-big {
font-size: 1.4em;
}
/* ckeditor5-font/theme/fontsize.css */
.ck-content .text-huge {
font-size: 1.8em;
}
/* ckeditor5-image/theme/imagestyle.css */
.ck-content .image-style-block-align-left,
.ck-content .image-style-block-align-right {
max-width: calc(100% - var(--ck-image-style-spacing));
}
/* ckeditor5-image/theme/imagestyle.css */
.ck-content .image-style-align-left,
.ck-content .image-style-align-right {
clear: none;
} }
/* ckeditor5-image/theme/imagestyle.css */ /* ckeditor5-image/theme/imagestyle.css */
.ck-content .image-style-side { .ck-content .image-style-side {
@ -83,6 +95,125 @@
float: right; float: right;
margin-left: var(--ck-image-style-spacing); margin-left: var(--ck-image-style-spacing);
} }
/* ckeditor5-image/theme/imagestyle.css */
.ck-content .image-style-block-align-right {
margin-right: 0;
margin-left: auto;
}
/* ckeditor5-image/theme/imagestyle.css */
.ck-content .image-style-block-align-left {
margin-left: 0;
margin-right: auto;
}
/* ckeditor5-image/theme/imagestyle.css */
.ck-content p + .image-style-align-left,
.ck-content p + .image-style-align-right,
.ck-content p + .image-style-side {
margin-top: 0;
}
/* ckeditor5-image/theme/imagestyle.css */
.ck-content .image-inline.image-style-align-left,
.ck-content .image-inline.image-style-align-right {
margin-top: var(--ck-inline-image-style-spacing);
margin-bottom: var(--ck-inline-image-style-spacing);
}
/* ckeditor5-image/theme/imagestyle.css */
.ck-content .image-inline.image-style-align-left {
margin-right: var(--ck-inline-image-style-spacing);
}
/* ckeditor5-image/theme/imagestyle.css */
.ck-content .image-inline.image-style-align-right {
margin-left: var(--ck-inline-image-style-spacing);
}
/* ckeditor5-image/theme/imagecaption.css */
.ck-content .image > figcaption {
display: table-caption;
caption-side: bottom;
word-break: break-word;
color: var(--ck-color-image-caption-text);
background-color: var(--ck-color-image-caption-background);
padding: .6em;
font-size: .75em;
outline-offset: -1px;
}
/* ckeditor5-image/theme/image.css */
.ck-content .image {
display: table;
clear: both;
text-align: center;
margin: 0.9em auto;
min-width: 50px;
}
/* ckeditor5-image/theme/image.css */
.ck-content .image img {
display: block;
margin: 0 auto;
max-width: 100%;
min-width: 100%;
}
/* ckeditor5-image/theme/image.css */
.ck-content .image-inline {
/*
* Normally, the .image-inline would have "display: inline-block" and "img { width: 100% }" (to follow the wrapper while resizing).;
* Unfortunately, together with "srcset", it gets automatically stretched up to the width of the editing root.
* This strange behavior does not happen with inline-flex.
*/
display: inline-flex;
max-width: 100%;
align-items: flex-start;
}
/* ckeditor5-image/theme/image.css */
.ck-content .image-inline picture {
display: flex;
}
/* ckeditor5-image/theme/image.css */
.ck-content .image-inline picture,
.ck-content .image-inline img {
flex-grow: 1;
flex-shrink: 1;
max-width: 100%;
}
/* ckeditor5-image/theme/imageresize.css */
.ck-content .image.image_resized {
max-width: 100%;
display: block;
box-sizing: border-box;
}
/* ckeditor5-image/theme/imageresize.css */
.ck-content .image.image_resized img {
width: 100%;
}
/* ckeditor5-image/theme/imageresize.css */
.ck-content .image.image_resized > figcaption {
display: block;
}
/* ckeditor5-code-block/theme/codeblock.css */
.ck-content pre {
padding: 1em;
color: hsl(0, 0%, 20.8%);
background: hsla(0, 0%, 78%, 0.3);
border: 1px solid hsl(0, 0%, 77%);
border-radius: 2px;
text-align: left;
direction: ltr;
tab-size: 4;
white-space: pre-wrap;
font-style: normal;
min-width: 200px;
}
/* ckeditor5-code-block/theme/codeblock.css */
.ck-content pre code {
background: unset;
padding: 0;
border-radius: 0;
}
/* ckeditor5-horizontal-line/theme/horizontalline.css */
.ck-content hr {
margin: 15px 0;
height: 4px;
background: hsl(0, 0%, 87%);
border: 0;
}
/* ckeditor5-block-quote/theme/blockquote.css */ /* ckeditor5-block-quote/theme/blockquote.css */
.ck-content blockquote { .ck-content blockquote {
overflow: hidden; overflow: hidden;
@ -98,6 +229,100 @@
border-left: 0; border-left: 0;
border-right: solid 5px hsl(0, 0%, 80%); border-right: solid 5px hsl(0, 0%, 80%);
} }
/* ckeditor5-basic-styles/theme/code.css */
.ck-content code {
background-color: hsla(0, 0%, 78%, 0.3);
padding: .15em;
border-radius: 2px;
}
/* ckeditor5-table/theme/table.css */
.ck-content .table {
margin: 0.9em auto;
display: table;
}
/* ckeditor5-table/theme/table.css */
.ck-content .table table {
border-collapse: collapse;
border-spacing: 0;
width: 100%;
height: 100%;
border: 1px double hsl(0, 0%, 70%);
}
/* ckeditor5-table/theme/table.css */
.ck-content .table table td,
.ck-content .table table th {
min-width: 2em;
padding: .4em;
border: 1px solid hsl(0, 0%, 75%);
}
/* ckeditor5-table/theme/table.css */
.ck-content .table table th {
font-weight: bold;
background: hsla(0, 0%, 0%, 5%);
}
/* ckeditor5-table/theme/table.css */
.ck-content[dir="rtl"] .table th {
text-align: right;
}
/* ckeditor5-table/theme/table.css */
.ck-content[dir="ltr"] .table th {
text-align: left;
}
/* ckeditor5-table/theme/tablecaption.css */
.ck-content .table > figcaption {
display: table-caption;
caption-side: top;
word-break: break-word;
text-align: center;
color: var(--ck-color-table-caption-text);
background-color: var(--ck-color-table-caption-background);
padding: .6em;
font-size: .75em;
outline-offset: -1px;
}
/* ckeditor5-page-break/theme/pagebreak.css */
.ck-content .page-break {
position: relative;
clear: both;
padding: 5px 0;
display: flex;
align-items: center;
justify-content: center;
}
/* ckeditor5-page-break/theme/pagebreak.css */
.ck-content .page-break::after {
content: '';
position: absolute;
border-bottom: 2px dashed hsl(0, 0%, 77%);
width: 100%;
}
/* ckeditor5-page-break/theme/pagebreak.css */
.ck-content .page-break__label {
position: relative;
z-index: 1;
padding: .3em .6em;
display: block;
text-transform: uppercase;
border: 1px solid hsl(0, 0%, 77%);
border-radius: 2px;
font-family: Helvetica, Arial, Tahoma, Verdana, Sans-Serif;
font-size: 0.75em;
font-weight: bold;
color: hsl(0, 0%, 20%);
background: hsl(0, 0%, 100%);
box-shadow: 2px 2px 1px hsla(0, 0%, 0%, 0.15);
-webkit-user-select: none;
-moz-user-select: none;
-ms-user-select: none;
user-select: none;
}
/* ckeditor5-media-embed/theme/mediaembed.css */
.ck-content .media {
clear: both;
margin: 0.9em 0;
display: block;
min-width: 15em;
}
/* ckeditor5-list/theme/todolist.css */ /* ckeditor5-list/theme/todolist.css */
.ck-content .todo-list { .ck-content .todo-list {
list-style: none; list-style: none;
@ -165,156 +390,9 @@
.ck-content .todo-list .todo-list__label .todo-list__label__description { .ck-content .todo-list .todo-list__label .todo-list__label__description {
vertical-align: middle; vertical-align: middle;
} }
/* ckeditor5-horizontal-line/theme/horizontalline.css */ /* ckeditor5-language/theme/language.css */
.ck-content hr { .ck-content span[lang] {
margin: 15px 0; font-style: italic;
height: 4px;
background: hsl(0, 0%, 87%);
border: 0;
}
/* ckeditor5-highlight/theme/highlight.css */
.ck-content .marker-yellow {
background-color: var(--ck-highlight-marker-yellow);
}
/* ckeditor5-highlight/theme/highlight.css */
.ck-content .marker-green {
background-color: var(--ck-highlight-marker-green);
}
/* ckeditor5-highlight/theme/highlight.css */
.ck-content .marker-pink {
background-color: var(--ck-highlight-marker-pink);
}
/* ckeditor5-highlight/theme/highlight.css */
.ck-content .marker-blue {
background-color: var(--ck-highlight-marker-blue);
}
/* ckeditor5-highlight/theme/highlight.css */
.ck-content .pen-red {
color: var(--ck-highlight-pen-red);
background-color: transparent;
}
/* ckeditor5-highlight/theme/highlight.css */
.ck-content .pen-green {
color: var(--ck-highlight-pen-green);
background-color: transparent;
}
/* ckeditor5-font/theme/fontsize.css */
.ck-content .text-tiny {
font-size: .7em;
}
/* ckeditor5-font/theme/fontsize.css */
.ck-content .text-small {
font-size: .85em;
}
/* ckeditor5-font/theme/fontsize.css */
.ck-content .text-big {
font-size: 1.4em;
}
/* ckeditor5-font/theme/fontsize.css */
.ck-content .text-huge {
font-size: 1.8em;
}
/* ckeditor5-basic-styles/theme/code.css */
.ck-content code {
background-color: hsla(0, 0%, 78%, 0.3);
padding: .15em;
border-radius: 2px;
}
/* ckeditor5-table/theme/table.css */
.ck-content .table {
margin: 1em auto;
display: table;
}
/* ckeditor5-table/theme/table.css */
.ck-content .table table {
border-collapse: collapse;
border-spacing: 0;
width: 100%;
height: 100%;
border: 1px double hsl(0, 0%, 70%);
}
/* ckeditor5-table/theme/table.css */
.ck-content .table table td,
.ck-content .table table th {
min-width: 2em;
padding: .4em;
border: 1px solid hsl(0, 0%, 75%);
}
/* ckeditor5-table/theme/table.css */
.ck-content .table table th {
font-weight: bold;
background: hsla(0, 0%, 0%, 5%);
}
/* ckeditor5-table/theme/table.css */
.ck-content[dir="rtl"] .table th {
text-align: right;
}
/* ckeditor5-table/theme/table.css */
.ck-content[dir="ltr"] .table th {
text-align: left;
}
/* ckeditor5-page-break/theme/pagebreak.css */
.ck-content .page-break {
position: relative;
clear: both;
padding: 5px 0;
display: flex;
align-items: center;
justify-content: center;
}
/* ckeditor5-page-break/theme/pagebreak.css */
.ck-content .page-break::after {
content: '';
position: absolute;
border-bottom: 2px dashed hsl(0, 0%, 77%);
width: 100%;
}
/* ckeditor5-page-break/theme/pagebreak.css */
.ck-content .page-break__label {
position: relative;
z-index: 1;
padding: .3em .6em;
display: block;
text-transform: uppercase;
border: 1px solid hsl(0, 0%, 77%);
border-radius: 2px;
font-family: Helvetica, Arial, Tahoma, Verdana, Sans-Serif;
font-size: 0.75em;
font-weight: bold;
color: hsl(0, 0%, 20%);
background: hsl(0, 0%, 100%);
box-shadow: 2px 2px 1px hsla(0, 0%, 0%, 0.15);
-webkit-user-select: none;
-moz-user-select: none;
-ms-user-select: none;
user-select: none;
}
/* ckeditor5-media-embed/theme/mediaembed.css */
.ck-content .media {
clear: both;
margin: 1em 0;
display: block;
min-width: 15em;
}
/* ckeditor5-code-block/theme/codeblock.css */
.ck-content pre {
padding: 1em;
color: hsl(0, 0%, 20.8%);
background: hsla(0, 0%, 78%, 0.3);
border: 1px solid hsl(0, 0%, 77%);
border-radius: 2px;
text-align: left;
direction: ltr;
tab-size: 4;
white-space: pre-wrap;
font-style: normal;
min-width: 200px;
}
/* ckeditor5-code-block/theme/codeblock.css */
.ck-content pre code {
background: unset;
padding: 0;
border-radius: 0;
} }
/* ckeditor5-mention/theme/mention.css */ /* ckeditor5-mention/theme/mention.css */
.ck-content .mention { .ck-content .mention {
@ -331,3 +409,4 @@
display: none; display: none;
} }
} }