Browse Source
Merge pull request #398 from mjashanks/frontend_bugfixes
Frontend bugfixes from #387
pull/403/head
Michael Shanks
6 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with
8 additions and
4 deletions
-
packages/builder/src/components/userInterface/AppPreview/iframeTemplate.js
-
packages/builder/src/components/userInterface/propertyCategories.js
-
packages/server/src/utilities/appDirectoryTemplate/pages/main/page.json
-
packages/server/src/utilities/appDirectoryTemplate/pages/unauthenticated/page.json
-
packages/server/src/utilities/builder/index.template.html
|
|
@ -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; |
|
|
|
|
|
@ -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", |
|
|
|
|
|
@ -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": {}, |
|
|
|
|
|
@ -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": {}, |
|
|
|
|
|
@ -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> |
|
|
|
|
|
|
|
|
|
