gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-11-04 05:28:59 +01:00
Code Issues Actions 17 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream-next/develop' into feature/i18n-part2

Browse Source
This commit is contained in:
Nriver 2024-08-16 11:23:35 +08:00
commit ff3effdb31
3 changed files with 1145 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/public/stylesheets/style.css
View File

@ -837,18 +837,24 @@ body {
scrollbar-color: var(--scrollbar-background-color) var(--main-background-color); scrollbar-color: var(--scrollbar-background-color) var(--main-background-color);
} }
::-webkit-scrollbar { @supports selector(::-webkit-scrollbar) {
width: 12px; body {
} scrollbar-color: unset;
}
::-webkit-scrollbar-thumb { ::-webkit-scrollbar {
width: 12px;
}
::-webkit-scrollbar-thumb {
border-radius: 5px; border-radius: 5px;
border: 1px solid var(--scrollbar-border-color); border: 1px solid var(--scrollbar-border-color);
background-color: var(--scrollbar-background-color); background-color: var(--scrollbar-background-color);
} }
::-webkit-scrollbar-corner { ::-webkit-scrollbar-corner {
background-color: inherit; background-color: inherit;
}
} }
[data-toggle="tooltip"]:not(.button-widget) span { [data-toggle="tooltip"]:not(.button-widget) span {

1123
src/public/translations/es/translation.json Normal file
View File

File diff suppressed because it is too large Load Diff

6
src/routes/api/options.ts
View File

@ -137,9 +137,13 @@ function getSupportedLocales() {
"id": "en", "id": "en",
"name": "English" "name": "English"
}, },
{
"id": "es",
"name": "Español"
},
{ {
"id": "cn", "id": "cn",
"name": "Chinese" "name": "简体中文"
} }
]; ];
} }