diff --git a/Dockerfile b/Dockerfile index d1d385e27..f907bb560 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM node:14.17.1-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 923912050..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.17.1 +NODE_VERSION=14.17.5 if [ "$1" != "DONTCOPY" ] then diff --git a/package.json b/package.json index 159d1979b..1d46213d8 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/public/app/layouts/mobile_layout.js b/src/public/app/layouts/mobile_layout.js index 6ca7ac95b..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') + .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') ) ) 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 +} 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" };