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

Merge remote-tracking branch 'origin/stable'

Browse Source
This commit is contained in:
zadam 2021-11-21 13:45:57 +01:00
commit de20183a22
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/public/app/layouts/mobile_layout.js
View File

@ -95,7 +95,7 @@ export default class MobileLayout {
return new FlexContainer('row').cssBlock(MOBILE_CSS) return new FlexContainer('row').cssBlock(MOBILE_CSS)
.setParent(appContext) .setParent(appContext)
.id('root-widget') .id('root-widget')
.css('height', '100vh') .css('height', '100%')
.child(new ScreenContainer("tree", 'column') .child(new ScreenContainer("tree", 'column')
.class("d-sm-flex d-md-flex d-lg-flex d-xl-flex col-12 col-sm-5 col-md-4 col-lg-4 col-xl-4") .class("d-sm-flex d-md-flex d-lg-flex d-xl-flex col-12 col-sm-5 col-md-4 col-lg-4 col-xl-4")
.css("max-height", "100%") .css("max-height", "100%")

2
src/public/app/widgets/containers/root_container.js
View File

@ -7,7 +7,7 @@ export default class RootContainer extends FlexContainer {
super('row'); super('row');
this.id('root-widget'); this.id('root-widget');
this.css('height', '100vh'); this.css('height', '100%');
} }
refresh() { refresh() {

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

@ -18,9 +18,11 @@ body {
on the last line of the editor. */ on the last line of the editor. */
position: fixed; position: fixed;
width: 100%; width: 100%;
height: 100%;
background-color: var(--main-background-color); background-color: var(--main-background-color);
color: var(--main-text-color); color: var(--main-text-color);
font-family: var(--main-font-family); font-family: var(--main-font-family);
font-size: var(--main-font-size);
} }
a, a:visited, a:hover { a, a:visited, a:hover {
@ -714,10 +716,6 @@ a.external:not(.no-arrow):after, a[href^="http://"]:not(.no-arrow):after, a[href
border-color: var(--main-border-color) !important; border-color: var(--main-border-color) !important;
} }
body {
font-size: var(--main-font-size);
}
.gutter { .gutter {
background: linear-gradient(to bottom, transparent, var(--accented-background-color), transparent); background: linear-gradient(to bottom, transparent, var(--accented-background-color), transparent);
} }