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

Merge remote-tracking branch 'origin/stable'

Browse Source 
# Conflicts:
#	Dockerfile
#	bin/build-server.sh
#	package-lock.json
#	src/public/app/layouts/mobile_layout.js
This commit is contained in:
zadam 2021-08-23 22:27:19 +02:00
commit 0ee093f038
6 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile
View File

@ -1,4 +1,4 @@
FROM node:14.17.1-alpine FROM node:14.17.5-alpine
# Create app directory # Create app directory
WORKDIR /usr/src/app WORKDIR /usr/src/app

2
bin/build-server.sh
View File

@ -1,7 +1,7 @@
#!/usr/bin/env bash #!/usr/bin/env bash
PKG_DIR=dist/trilium-linux-x64-server PKG_DIR=dist/trilium-linux-x64-server
NODE_VERSION=14.17.1 NODE_VERSION=14.17.5
if [ "$1" != "DONTCOPY" ] if [ "$1" != "DONTCOPY" ]
then then

2
package.json
View File

@ -2,7 +2,7 @@
"name": "trilium", "name": "trilium",
"productName": "Trilium Notes", "productName": "Trilium Notes",
"description": "Trilium Notes", "description": "Trilium Notes",
"version": "0.47.6", "version": "0.47.7",
"license": "AGPL-3.0-only", "license": "AGPL-3.0-only",
"main": "electron.js", "main": "electron.js",
"bin": { "bin": {

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

@ -98,11 +98,9 @@ export default class MobileLayout {
.child(new ScreenContainer("detail", "column") .child(new ScreenContainer("detail", "column")
.class("d-sm-flex d-md-flex d-lg-flex d-xl-flex col-12 col-sm-7 col-md-8 col-lg-8") .class("d-sm-flex d-md-flex d-lg-flex d-xl-flex col-12 col-sm-7 col-md-8 col-lg-8")
.css('max-height', '100%') .css('max-height', '100%')
.child(new FlexContainer('row') .child(new FlexContainer('row').overflowing().filling()
.css('font-size', 'larger') .css('font-size', 'larger')
.css('align-items', 'center') .css('align-items', 'center')
.css('position', 'fixed')
.css('top', 0)
.child(new MobileDetailMenuWidget()) .child(new MobileDetailMenuWidget())
.child(new NoteTitleWidget()) .child(new NoteTitleWidget())
.child(new CloseDetailButtonWidget())) .child(new CloseDetailButtonWidget()))
@ -111,7 +109,6 @@ export default class MobileLayout {
.child( .child(
new NoteDetailWidget() new NoteDetailWidget()
.css('padding', '5px 20px 10px 0') .css('padding', '5px 20px 10px 0')
.css('margin-top', '55px')
.css('contain', 'content') .css('contain', 'content')
) )
) )

2
src/public/app/services/mime_types.js
View File

@ -111,7 +111,7 @@ const MIME_TYPES_DICT = [
{ title: "Scala", mime: "text/x-scala" }, { title: "Scala", mime: "text/x-scala" },
{ title: "Scheme", mime: "text/x-scheme" }, { title: "Scheme", mime: "text/x-scheme" },
{ title: "SCSS", mime: "text/x-scss" }, { title: "SCSS", mime: "text/x-scss" },
{ default: true, title: "Shell", mime: "text/x-sh" }, { default: true, title: "Shell (bash)", mime: "text/x-sh" },
{ title: "Sieve", mime: "application/sieve" }, { title: "Sieve", mime: "application/sieve" },
{ title: "Slim", mime: "text/x-slim" }, { title: "Slim", mime: "text/x-slim" },
{ title: "Smalltalk", mime: "text/x-stsrc" }, { title: "Smalltalk", mime: "text/x-stsrc" },

2
src/services/build.js
View File

@ -1 +1 @@
module.exports = { buildDate:"2021-08-21T20:56:58+02:00", buildRevision: "3fd16a16e8c944882626a019dd6e47448ec94169" }; module.exports = { buildDate:"2021-08-22T12:36:49+02:00", buildRevision: "08eda83700038b4a658d6830dcf8e34d1bcfbc0f" };