Merge pull request #398 from mjashanks/frontend_bugfixes

Frontend bugfixes from #387
6 years ago · 256ebb5c92
5 changed files with 8 additions and 4 deletions
--- a/packages/builder/src/components/userInterface/AppPreview/iframeTemplate.js
+++ b/packages/builder/src/components/userInterface/AppPreview/iframeTemplate.js
@ -1,5 +1,7 @@
 export default `<html>
  <head>
+    <link rel="stylesheet" href="https://rsms.me/inter/inter.css">
+    <link rel="stylesheet" href="https://fonts.googleapis.com/css2?family=Roboto+Mono">
    <style>
      body, html {
        height: 100%!important;
--- a/packages/builder/src/components/userInterface/propertyCategories.js
+++ b/packages/builder/src/components/userInterface/propertyCategories.js
@ -123,7 +123,7 @@ export const margin = [
  },
  {
    label: "Bottom",
-    key: "padding-bottom",
+    key: "margin-bottom",
    control: OptionSelect,
    options: [
      { label: "None", value: "0px" },
@ -352,7 +352,6 @@ export const typography = [
      "Inter",
      "Lucida Sans Unicode",
      "Open Sans",
-      "Playfair",
      "Roboto",
      "Roboto Mono",
      "Times New Roman",
--- a/packages/server/src/utilities/appDirectoryTemplate/pages/main/page.json
+++ b/packages/server/src/utilities/appDirectoryTemplate/pages/main/page.json
@ -4,6 +4,7 @@
 	"stylesheets": [],
 	"componentLibraries": ["@budibase/standard-components", "@budibase/materialdesign-components"],
 	"props" : {
+		"_id": "private-master-root",
 		"_component": "@budibase/standard-components/container",
 		"_children": [
      {
@ -19,7 +20,6 @@
        "_children": []
      }
    ],
-		"_id": 0,
 		"type": "div",
 		"_styles": {
 			"active": {},
--- a/packages/server/src/utilities/appDirectoryTemplate/pages/unauthenticated/page.json
+++ b/packages/server/src/utilities/appDirectoryTemplate/pages/unauthenticated/page.json
@ -7,6 +7,7 @@
  "favicon": "./_shared/favicon.png",
  "stylesheets": [],
  "props": {
+    "_id": "public-master-root",
    "_component": "@budibase/standard-components/container",
    "_children": [
      {
@ -31,7 +32,6 @@
        "logo": ""
      }
    ],
-    "_id": 1,
    "type": "div",
    "_styles": {
      "layout": {},
--- a/packages/server/src/utilities/builder/index.template.html
+++ b/packages/server/src/utilities/builder/index.template.html
@ -31,6 +31,9 @@
    <link rel='stylesheet' href='/assets{{ pageStyle }}'>
    {{ /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/budibase-client.js'></script>