Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-10-31 18:36:30 +01:00
Code Issues Packages Projects Releases Activity

styling changes

Browse Source
This commit is contained in:
zadam
2019-11-14 20:27:28 +01:00
parent c0eb30472e
commit e143becb7a
4 changed files with 37 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
package-lock.json generated
View File

@@ -3112,9 +3112,9 @@
"integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=" "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0="
}, },
"ejs": { "ejs": {
"version": "2.7.1", "version": "2.7.2",
"resolved": "https://registry.npmjs.org/ejs/-/ejs-2.7.1.tgz", "resolved": "https://registry.npmjs.org/ejs/-/ejs-2.7.2.tgz",
"integrity": "sha512-kS/gEPzZs3Y1rRsbGX4UOSjtP/CeJP0CxSNZHYxGfVM/VgLcv0ZqM7C45YyTj2DI2g7+P9Dd24C+IMIg6D0nYQ==" "integrity": "sha512-rHGwtpl67oih3xAHbZlpw5rQAt+YV1mSCu2fUZ9XNrfaGEhom7E+AUiMci+ByP4aSfuAWx7hE0BPuJLMrpXwOw=="
}, },
"electron": { "electron": {
"version": "6.0.12", "version": "6.0.12",
@@ -8130,11 +8130,18 @@
"integrity": "sha512-jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA==" "integrity": "sha512-jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA=="
}, },
"mime-types": { "mime-types": {
"version": "2.1.24", "version": "2.1.25",
"resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.24.tgz", "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.25.tgz",
"integrity": "sha512-WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ==", "integrity": "sha512-5KhStqB5xpTAeGqKBAMgwaYMnQik7teQN4IAzC7npDv6kzeU6prfkR67bc87J1kWMPGkoaZSq1npmexMgkmEVg==",
"requires": { "requires": {
"mime-db": "1.40.0" "mime-db": "1.42.0"
},
"dependencies": {
"mime-db": {
"version": "1.42.0",
"resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.42.0.tgz",
"integrity": "sha512-UbfJCR4UAVRNgMpfImz05smAXK7+c+ZntjaA26ANtkXLlOe947Aag5zdIcKQULAiF9Cq4WxBi9jUs5zkA84bYQ=="
}
} }
}, },
"mimic-fn": { "mimic-fn": {

4
package.json
View File

@@ -29,7 +29,7 @@
"csurf": "1.10.0", "csurf": "1.10.0",
"dayjs": "1.8.17", "dayjs": "1.8.17",
"debug": "4.1.1", "debug": "4.1.1",
"ejs": "2.7.1", "ejs": "2.7.2",
"electron-debug": "3.0.1", "electron-debug": "3.0.1",
"electron-dl": "1.14.0", "electron-dl": "1.14.0",
"electron-find": "1.0.6", "electron-find": "1.0.6",
@@ -51,7 +51,7 @@
"imagemin-pngquant": "8.0.0", "imagemin-pngquant": "8.0.0",
"ini": "1.3.5", "ini": "1.3.5",
"jimp": "0.8.5", "jimp": "0.8.5",
"mime-types": "2.1.24", "mime-types": "2.1.25",
"moment": "2.24.0", "moment": "2.24.0",
"multer": "1.4.2", "multer": "1.4.2",
"node-abi": "2.12.0", "node-abi": "2.12.0",

15
src/public/stylesheets/desktop.css
View File

@@ -145,7 +145,7 @@ body {
::-webkit-scrollbar-thumb { ::-webkit-scrollbar-thumb {
border-radius: 3px; border-radius: 3px;
border: 1px solid var(--main-border-color); border: 1px solid var(--scrollbar-border-color);
} }
::-webkit-scrollbar-corner { ::-webkit-scrollbar-corner {
@@ -256,11 +256,14 @@ body {
border-top-right-radius: 8px; border-top-right-radius: 8px;
overflow: hidden; overflow: hidden;
pointer-events: all; pointer-events: all;
background-image: linear-gradient(to bottom, var(--accented-background-color), var(--main-background-color)); background-color: var(--accented-background-color);
border-bottom: 1px solid var(--button-border-color);
} }
.note-tab-row .note-tab[active] .note-tab-wrapper { .note-tab-row .note-tab[active] .note-tab-wrapper {
background-image: linear-gradient(to bottom, var(--more-accented-background-color), var(--main-background-color)); background-color: var(--main-background-color);
border: 1px solid var(--button-border-color);
border-bottom: 0;
font-weight: bold; font-weight: bold;
} }
@@ -380,6 +383,8 @@ body {
border: 0; border: 0;
background: inherit; background: inherit;
font-weight: bold; font-weight: bold;
text-transform: uppercase;
color: var(--muted-text-color) !important;
} }
.note-detail-sidebar .widget-header-action { .note-detail-sidebar .widget-header-action {
@@ -388,7 +393,9 @@ body {
} }
.note-detail-sidebar .widget-help { .note-detail-sidebar .widget-help {
color: var(--main-text-color); color: var(--muted-text-color);
position: relative;
top: 2px;
} }
.note-detail-sidebar .widget-help.no-link:hover { .note-detail-sidebar .widget-help.no-link:hover {

17
src/public/stylesheets/themes.css
View File

@@ -10,26 +10,27 @@
--main-text-color: black; --main-text-color: black;
--main-border-color: #ccc; --main-border-color: #ccc;
--accented-background-color: #f5f5f5; --accented-background-color: #f5f5f5;
--more-accented-background-color: #ccc; --more-accented-background-color: #ddd;
--header-background-color: #f8f8f8; --header-background-color: #fff;
--button-background-color: #eee; --button-background-color: #fff;
--button-disabled-background-color: #ccc; --button-disabled-background-color: #ddd;
--button-border-color: #ddd; --button-border-color: #ddd;
--button-text-color: black; --button-text-color: black;
--button-border-radius: 5px; --button-border-radius: 5px;
--muted-text-color: #444; --muted-text-color: #666;
--input-text-color: black; --input-text-color: black;
--input-background-color: white; --input-background-color: white;
--hover-item-text-color: black; --hover-item-text-color: black;
--hover-item-background-color: #eee; --hover-item-background-color: #eee;
--active-item-text-color: black; --active-item-text-color: black;
--active-item-background-color: #ccc; --active-item-background-color: #ddd;
--menu-text-color: black; --menu-text-color: black;
--menu-background-color: white; --menu-background-color: white;
--tooltip-background-color: #f8f8f8; --tooltip-background-color: #f8f8f8;
--link-color: blue; --link-color: blue;
--modal-background-color: white; --modal-background-color: white;
--modal-backdrop-color: black; --modal-backdrop-color: black;
--scrollbar-border-color: #ddd;
} }
body.theme-black { body.theme-black {
@@ -56,6 +57,7 @@ body.theme-black {
--link-color: lightskyblue; --link-color: lightskyblue;
--modal-background-color: black; --modal-background-color: black;
--modal-backdrop-color: #444; --modal-backdrop-color: #444;
--scrollbar-border-color: #888;
} }
body.theme-black .CodeMirror { body.theme-black .CodeMirror {
@@ -65,7 +67,7 @@ body.theme-black .CodeMirror {
body.theme-dark { body.theme-dark {
--main-background-color: #333; --main-background-color: #333;
--main-text-color: white; --main-text-color: white;
--main-border-color: #ddd; --main-border-color: #aaa;
--accented-background-color: #555; --accented-background-color: #555;
--more-accented-background-color: #777; --more-accented-background-color: #777;
--header-background-color: #333; --header-background-color: #333;
@@ -86,6 +88,7 @@ body.theme-dark {
--link-color: lightskyblue; --link-color: lightskyblue;
--modal-background-color: #333; --modal-background-color: #333;
--modal-backdrop-color: #444; --modal-backdrop-color: #444;
--scrollbar-border-color: #888;
} }
body.theme-dark .CodeMirror { body.theme-dark .CodeMirror {