From de8010cdf5ae64bea3fe1400686ddccb4a01d2a3 Mon Sep 17 00:00:00 2001 From: Martin McKeaveney Date: Wed, 3 Jun 2020 12:05:40 +0100 Subject: [PATCH 1/5] electron path fix --- packages/server/.env.template | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/server/.env.template b/packages/server/.env.template index 170d391520..3593f96ee8 100644 --- a/packages/server/.env.template +++ b/packages/server/.env.template @@ -15,4 +15,7 @@ JWT_SECRET={{cookieKey1}} PORT=4001 # error level for koa-pino -LOG_LEVEL=error \ No newline at end of file +LOG_LEVEL=error + +# Budibase app directory +BUDIBASE_DIR=~/.budibase \ No newline at end of file From 0aa9aece0b009c266432cb7c595f001ae6154e6d Mon Sep 17 00:00:00 2001 From: kevmodrome Date: Wed, 3 Jun 2020 14:36:39 +0200 Subject: [PATCH 2/5] adds options to navbar component --- .../components/userInterface/AppPreview/iframeTemplate.js | 1 + .../components/userInterface/temporaryPanelStructure.js | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/packages/builder/src/components/userInterface/AppPreview/iframeTemplate.js b/packages/builder/src/components/userInterface/AppPreview/iframeTemplate.js index d3a94b6cf5..462becb32f 100644 --- a/packages/builder/src/components/userInterface/AppPreview/iframeTemplate.js +++ b/packages/builder/src/components/userInterface/AppPreview/iframeTemplate.js @@ -17,6 +17,7 @@ export default ({ body, html { height: 100%!important; + font-family: Roboto !important; } .lay-__screenslot__text { width: 100%; diff --git a/packages/builder/src/components/userInterface/temporaryPanelStructure.js b/packages/builder/src/components/userInterface/temporaryPanelStructure.js index 55036b2da5..9a57c6d638 100644 --- a/packages/builder/src/components/userInterface/temporaryPanelStructure.js +++ b/packages/builder/src/components/userInterface/temporaryPanelStructure.js @@ -349,7 +349,13 @@ export default { "A component for handling the navigation within your app.", icon: "ri-navigation-fill", children: [], - properties: { design: { ...all } }, + properties: { + design: { ...all }, + settings: [ + { label: "Logo URL", key: "logoUrl", control: Input }, + { label: "Title", key: "title", control: Input }, + { label: "Background", key: "backgroundColor", control: Input }], + }, }, ], }, From dba1ff1de116e2fb60e37ada65b649d6f5ac4994 Mon Sep 17 00:00:00 2001 From: kevmodrome Date: Wed, 3 Jun 2020 14:52:18 +0200 Subject: [PATCH 3/5] adds another color to Nav Bar and also adds roboto as default font in created apps --- .../userInterface/temporaryPanelStructure.js | 1 + .../src/utilities/builder/index.template.html | 20 +++++++++++-------- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/packages/builder/src/components/userInterface/temporaryPanelStructure.js b/packages/builder/src/components/userInterface/temporaryPanelStructure.js index 9a57c6d638..3c217fe868 100644 --- a/packages/builder/src/components/userInterface/temporaryPanelStructure.js +++ b/packages/builder/src/components/userInterface/temporaryPanelStructure.js @@ -354,6 +354,7 @@ export default { settings: [ { label: "Logo URL", key: "logoUrl", control: Input }, { label: "Title", key: "title", control: Input }, + { label: "Color", key: "color", control: Input }, { label: "Background", key: "backgroundColor", control: Input }], }, }, diff --git a/packages/server/src/utilities/builder/index.template.html b/packages/server/src/utilities/builder/index.template.html index 951ed8fdf4..2f1f7ed87c 100644 --- a/packages/server/src/utilities/builder/index.template.html +++ b/packages/server/src/utilities/builder/index.template.html @@ -1,14 +1,17 @@ - - - - {{ title }} + + + + + {{ title }} - +