MirrorSave
/
budibase
mirror of https://github.com/Budibase/budibase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #398 from mjashanks/frontend_bugfixes 

Frontend bugfixes from #387
This commit is contained in:
Michael Shanks 2020-06-29 14:39:05 +01:00 committed by GitHub
parent bda3dc3f7d ca66550984
commit 56a7fd930b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/builder/src/components/userInterface/AppPreview/iframeTemplate.js
View File

@ -1,5 +1,7 @@
export default `<html> export default `<html>
<head> <head>
<link rel="stylesheet" href="https://rsms.me/inter/inter.css">
<link rel="stylesheet" href="https://fonts.googleapis.com/css2?family=Roboto+Mono">
<style> <style>
body, html { body, html {
height: 100%!important; height: 100%!important;

3
packages/builder/src/components/userInterface/propertyCategories.js
View File

@ -123,7 +123,7 @@ export const margin = [
}, },
{ {
label: "Bottom", label: "Bottom",
key: "padding-bottom", key: "margin-bottom",
control: OptionSelect, control: OptionSelect,
options: [ options: [
{ label: "None", value: "0px" }, { label: "None", value: "0px" },
@ -352,7 +352,6 @@ export const typography = [
"Inter", "Inter",
"Lucida Sans Unicode", "Lucida Sans Unicode",
"Open Sans", "Open Sans",
"Playfair",
"Roboto", "Roboto",
"Roboto Mono", "Roboto Mono",
"Times New Roman", "Times New Roman",

2
packages/server/src/utilities/appDirectoryTemplate/pages/main/page.json
View File

@ -4,6 +4,7 @@
"stylesheets": [], "stylesheets": [],
"componentLibraries": ["@budibase/standard-components", "@budibase/materialdesign-components"], "componentLibraries": ["@budibase/standard-components", "@budibase/materialdesign-components"],
"props" : { "props" : {
"_id": "private-master-root",
"_component": "@budibase/standard-components/container", "_component": "@budibase/standard-components/container",
"_children": [ "_children": [
{ {
@ -19,7 +20,6 @@
"_children": [] "_children": []
} }
], ],
"_id": 0,
"type": "div", "type": "div",
"_styles": { "_styles": {
"active": {}, "active": {},

2
packages/server/src/utilities/appDirectoryTemplate/pages/unauthenticated/page.json
View File

@ -7,6 +7,7 @@
"favicon": "./_shared/favicon.png", "favicon": "./_shared/favicon.png",
"stylesheets": [], "stylesheets": [],
"props": { "props": {
"_id": "public-master-root",
"_component": "@budibase/standard-components/container", "_component": "@budibase/standard-components/container",
"_children": [ "_children": [
{ {
@ -31,7 +32,6 @@
"logo": "" "logo": ""
} }
], ],
"_id": 1,
"type": "div", "type": "div",
"_styles": { "_styles": {
"layout": {}, "layout": {},

3
packages/server/src/utilities/builder/index.template.html
View File

@ -31,6 +31,9 @@
<link rel='stylesheet' href='/assets{{ pageStyle }}'> <link rel='stylesheet' href='/assets{{ pageStyle }}'>
{{ /if }} {{ /if }}
<link rel="stylesheet" href="https://rsms.me/inter/inter.css">
<link rel="stylesheet" href="https://fonts.googleapis.com/css2?family=Roboto+Mono">
<script src='/assets/clientFrontendDefinition.js'></script> <script src='/assets/clientFrontendDefinition.js'></script>
<script src='/assets/budibase-client.js'></script> <script src='/assets/budibase-client.js'></script>