From d23bb5fd17bb9c46de828ef29987eb38d887e676 Mon Sep 17 00:00:00 2001 From: zadam Date: Sun, 22 Aug 2021 12:21:22 +0200 Subject: [PATCH 1/4] note title gets overflown by long content --- package-lock.json | 4 ++-- src/public/app/layouts/mobile_layout.js | 5 +---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/package-lock.json b/package-lock.json index 1d165ea77..d9a263ef4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "trilium", - "version": "0.47.5", + "version": "0.47.6", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "trilium", - "version": "0.47.5", + "version": "0.47.6", "license": "AGPL-3.0-only", "dependencies": { "archiver": "^5.3.0", diff --git a/src/public/app/layouts/mobile_layout.js b/src/public/app/layouts/mobile_layout.js index a715b5563..5cf662c31 100644 --- a/src/public/app/layouts/mobile_layout.js +++ b/src/public/app/layouts/mobile_layout.js @@ -98,11 +98,9 @@ export default class MobileLayout { .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") .css('max-height', '100%') - .child(new FlexContainer('row').overflowing() + .child(new FlexContainer('row').overflowing().filling() .css('font-size', 'larger') .css('align-items', 'center') - .css('position', 'fixed') - .css('top', 0) .child(new MobileDetailMenuWidget()) .child(new NoteTitleWidget()) .child(new CloseDetailButtonWidget())) @@ -111,7 +109,6 @@ export default class MobileLayout { .child( new NoteDetailWidget() .css('padding', '5px 20px 10px 0') - .css('margin-top', '55px') .css('contain', 'content') ) ) From 08eda83700038b4a658d6830dcf8e34d1bcfbc0f Mon Sep 17 00:00:00 2001 From: zadam Date: Sun, 22 Aug 2021 12:25:50 +0200 Subject: [PATCH 2/4] node update to 14.17.5 --- Dockerfile | 2 +- bin/build-server.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 8552e3404..f907bb560 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM node:14.17.0-alpine +FROM node:14.17.5-alpine # Create app directory WORKDIR /usr/src/app diff --git a/bin/build-server.sh b/bin/build-server.sh index de98c7795..b261ccd11 100755 --- a/bin/build-server.sh +++ b/bin/build-server.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash PKG_DIR=dist/trilium-linux-x64-server -NODE_VERSION=14.16.1 +NODE_VERSION=14.17.5 if [ "$1" != "DONTCOPY" ] then From c59b3a0c5c43a7195062bfe7fc60ec59fe5a1b6f Mon Sep 17 00:00:00 2001 From: zadam Date: Sun, 22 Aug 2021 12:36:49 +0200 Subject: [PATCH 3/4] release 0.47.7 --- package.json | 2 +- src/services/build.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 43c6cda55..a8b90b641 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "trilium", "productName": "Trilium Notes", "description": "Trilium Notes", - "version": "0.47.6", + "version": "0.47.7", "license": "AGPL-3.0-only", "main": "electron.js", "bin": { diff --git a/src/services/build.js b/src/services/build.js index 58cb471c6..1dd77908d 100644 --- a/src/services/build.js +++ b/src/services/build.js @@ -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" }; From 06eb0ce910c0bf0fc171e4c37943d04d82d69d92 Mon Sep 17 00:00:00 2001 From: zadam Date: Mon, 23 Aug 2021 22:26:01 +0200 Subject: [PATCH 4/4] alias shell with bash --- src/public/app/services/mime_types.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/public/app/services/mime_types.js b/src/public/app/services/mime_types.js index acf15ef29..70177b233 100644 --- a/src/public/app/services/mime_types.js +++ b/src/public/app/services/mime_types.js @@ -111,7 +111,7 @@ const MIME_TYPES_DICT = [ { title: "Scala", mime: "text/x-scala" }, { title: "Scheme", mime: "text/x-scheme" }, { 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: "Slim", mime: "text/x-slim" }, { title: "Smalltalk", mime: "text/x-stsrc" }, @@ -184,4 +184,4 @@ async function getMimeTypes() { export default { getMimeTypes, loadMimeTypes -} \ No newline at end of file +}