gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-06-06 18:08:33 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixes

Browse Source
This commit is contained in:
zadam 2020-02-07 22:19:35 +01:00
parent 47f7f5f4d9
commit 9acf723a9a
4 changed files with 4 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/public/javascripts/widgets/layout.js
View File

@ -35,7 +35,7 @@ export default class Layout {
new TitleBarButtonsWidget(appContext) new TitleBarButtonsWidget(appContext)
]), ]),
new StandardTopWidget(appContext), new StandardTopWidget(appContext),
new FlexContainer(appContext, { 'flex-direction': 'row' }, [ new FlexContainer(appContext, { 'flex-direction': 'row', 'overflow': 'hidden' }, [
new SidePaneContainer(appContext, 'left', [ new SidePaneContainer(appContext, 'left', [
new GlobalButtonsWidget(appContext), new GlobalButtonsWidget(appContext),
new SearchBoxWidget(appContext), new SearchBoxWidget(appContext),

16
src/public/javascripts/widgets/side_pane_container.js
View File

@ -1,24 +1,14 @@
import BasicWidget from "./basic_widget.js";
import options from "../services/options.js"; import options from "../services/options.js";
import FlexContainer from "./flex_container.js";
export default class SidePaneContainer extends BasicWidget { export default class SidePaneContainer extends FlexContainer {
constructor(appContext, side, widgets) { constructor(appContext, side, widgets) {
super(appContext); super(appContext, {id: side + '-pane', 'flex-direction': 'column', 'height': '100%'}, widgets);
this.side = side; this.side = side;
this.children = widgets; this.children = widgets;
} }
render() {
this.$widget = $(`<div id="${this.side}-pane" style="display: flex; flex-direction: column;">`);
for (const widget of this.children) {
this.$widget.append(widget.render());
}
return this.$widget;
}
eventReceived(name, data, sync = false) { eventReceived(name, data, sync = false) {
if (options.is(this.side + 'PaneVisible')) { if (options.is(this.side + 'PaneVisible')) {
super.eventReceived(name, data, sync); super.eventReceived(name, data, sync);

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

@ -45,12 +45,6 @@ body {
width: 100%; width: 100%;
} }
#left-pane {
height: 100%;
display: flex;
flex-direction: column;
}
.dropdown-menu { .dropdown-menu {
font-size: inherit; font-size: inherit;
} }
@ -146,14 +140,6 @@ body {
border-color: var(--button-border-color); border-color: var(--button-border-color);
} }
#right-pane {
overflow: auto;
padding-top: 4px;
padding-left: 7px;
font-size: 90%;
height: 100%;
}
#right-pane .card { #right-pane .card {
border: 0; border: 0;
} }

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

@ -9,12 +9,6 @@ html, body {
height: 100%; height: 100%;
} }
#left-pane {
height: 100%;
display: flex;
flex-direction: column;
}
#global-buttons { #global-buttons {
display: flex; display: flex;
flex-shrink: 0; flex-shrink: 0;