Merge branch 'master' of github.com:Budibase/budibase

packages/builder/src/BackendRoot.svelte

@@ -37,13 +37,13 @@
 
   .content {
     flex: 1 1 auto;
-    margin: 80px 60px;
+    margin: 20px 40px;
   }
 
   .nav {
     overflow: auto;
     flex: 0 1 auto;
-    width: 300px;
+    width: 275px;
     height: 100%;
   }
 </style>

packages/builder/src/budibase.css

@@ -62,9 +62,9 @@
     margin: 5px 20px 5px 0px;
     border-radius: 0 5px 5px 0;
     display: flex;
-    align-items: center;
+    align-items: baseline;
     font-weight: 500;
-    font-size: 0.8em;
+    font-size: 12px;
 }
 
 .budibase__nav-item.selected {

packages/builder/src/components/common/ActionButton.svelte

@@ -46,7 +46,8 @@
 
   .button:hover {
     cursor: pointer;
-    font-weight: 700;
+    font-weight: 600;
+    filter:saturate(90%);
   }
 
   .button:disabled {

packages/builder/src/components/common/Icons/DownArrow.svelte

@@ -0,0 +1,10 @@
+<svg 
+    xmlns="http://www.w3.org/2000/svg" 
+    viewBox="0 0 24 24" 
+    width="100%" 
+    height="100%">
+    <path fill="none" d="M0 0h24v24H0z"/>
+    <path 
+        fill="rgba(0,3,51,1)"
+        d="M12 14l-4-4h8z" />
+</svg>

packages/builder/src/components/common/Icons/index.js

@@ -4,6 +4,7 @@ export { default as TerminalIcon } from "./Terminal.svelte"
 export { default as InputIcon } from "./Input.svelte"
 export { default as ImageIcon } from "./Image.svelte"
 export { default as ArrowDownIcon } from "./ArrowDown.svelte"
+export { default as DownArrowIcon } from "./DownArrow.svelte"
 export { default as CircleIndicator } from "./CircleIndicator.svelte"
 export { default as PencilIcon } from "./Pencil.svelte"
 export { default as EventsIcon } from "./Events.svelte"

packages/builder/src/components/common/Select.svelte

@@ -19,22 +19,22 @@
 
 <style>
   .select-container {
-    font-size: 0.9rem;
+    font-size: 14px;
-    color: var(--secondary50);
+    color: var(--secondary60);
     font-weight: bold;
     position: relative;
-    max-width: 300px;
+    max-width: 400px;
-    min-width: 200px;
+    min-width: 275px;
   }
 
   .adjusted {
-    padding-left: 2.5em;
+    padding-left: 30px;
   }
 
   i {
     position: absolute;
-    left: 8px;
+    left: 10px;
-    top: 8px;
+    top: 10px;
   }
 
   select {
@@ -42,8 +42,9 @@
     display: block;
     font-family: sans-serif;
     font-weight: 400;
+    font-size: 14px;
     color: #000333;
-    padding: 0 2.6em 0em 1.4em;
+    padding: 0 40px 0px 20px;
     width: 100%;
     max-width: 100%;
     box-sizing: border-box;
@@ -51,7 +52,7 @@
     -moz-appearance: none;
     -webkit-appearance: none;
     appearance: none;
-    background: var(--lightslate);
+    background: var(--white);
   }
 
   .arrow {
@@ -62,6 +63,6 @@
     width: 30px;
     height: 30px;
     pointer-events: none;
-    color: var(--primary100);
+    color: var(--secondary100);
   }
 </style>

packages/builder/src/components/database/DatabaseRoot.svelte

@@ -63,7 +63,7 @@
 <div class="root">
   <div class="node-view">
     <div class="database-actions">
-      <div class="budibase__label--big">{breadcrumbs}</div>
+      <div class="breadcrumb">{breadcrumbs}</div>
       {#if $backendUiStore.selectedDatabase.id}
         <ActionButton
           primary
@@ -92,6 +92,13 @@
     flex: 1 1 auto;
   }
 
+  .breadcrumb {
+    text-transform: uppercase;
+    font-size: 12px;
+    font-weight: 500;
+    color: var(--secondary60);
+  }
+
   .database-actions {
     display: flex;
     justify-content: space-between;

packages/builder/src/components/database/ModelDataTable/ModelDataTable.svelte

@@ -99,9 +99,9 @@
 
 <section>
   <div class="table-controls">
-    <h4 class="budibase__title--3">
+    <h2 class="title">
       {takeRight(2, $backendUiStore.breadcrumbs).join(' / ')}
-    </h4>
+    </h2>
     <Select icon="ri-eye-line" bind:value={$backendUiStore.selectedView}>
       {#each views as view}
         <option value={view}>{view.name}</option>
@@ -166,6 +166,18 @@
 </section>
 
 <style>
+
+  .title {
+    font-size: 24px;
+    font-weight: 600;
+    text-rendering: optimizeLegibility;
+    text-transform: capitalize;
+  }
+
+  .select {
+    background: white;
+  }
+
   table {
     border: 1px solid #ccc;
     background: #fff;
@@ -174,19 +186,24 @@
   }
 
   thead {
-    background: var(--background-button);
+    background: #f9f9f9;
+    border: 1px solid #ccc;
   }
 
   thead th {
     color: var(--button-text);
     text-transform: capitalize;
     font-weight: 500;
+    font-size: 14px;  
+    text-rendering: optimizeLegibility;
+    letter-spacing: 1px;
   }
 
   tbody tr {
     border-bottom: 1px solid #ccc;
     transition: 0.3s background-color;
-    color: var(--darkslate);
+    color: var(--secondary100);
+    font-size: 14px;
   }
 
   tbody tr:hover {
@@ -196,7 +213,8 @@
   .table-controls {
     display: flex;
     justify-content: space-between;
-    align-items: center;
+    align-items: baseline;
+    margin-top: 10px;
   }
 
   .ri-more-line:hover,

packages/builder/src/components/nav/BackendNav.svelte

@@ -50,19 +50,24 @@
     flex-direction: column;
     max-height: 100%;
     height: 100%;
-    background-color: var(--white);
+    background: var(--white);
   }
 
   .nav-group-header {
     display: flex;
     justify-content: space-between;
     align-items: center;
-    padding: 2rem 1rem 1rem 1rem;
+    padding: 20px 20px 10px 20px;
   }
 
   .hierarchy-title {
+    align-items: center;
     text-transform: uppercase;
-    font-size: 0.85em;
+    font-size: 12px;
+    font-weight: bold;
+    opacity: 0.6;
+    letter-spacing: 1px;
+    text-rendering: optimizeLegibility;
   }
 
   .hierarchy {

packages/builder/src/components/nav/DatabasesList.svelte

@@ -42,15 +42,14 @@
             <CheckIcon />
           {/if}
         </span>
-        <i
-          class="ri-delete-bin-7-line hoverable uk-margin-small-left"
-          on:click={() => deleteDatabase(database)} />
         <button
           class:active={database.id === $backendUiStore.selectedDatabase.id}
           on:click={() => selectDatabase(database)}>
           {database.name}
         </button>
-
+        <i
+          class="ri-delete-bin-7-line hoverable alignment"
+          on:click={() => deleteDatabase(database)} />
       </li>
     {/each}
   </ul>
@@ -58,12 +57,10 @@
 
 <style>
   .root {
-    padding-bottom: 10px;
+    font-size: 12px;
-    font-size: 0.9rem;
+    color: var(--secondary100);
-    color: var(--secondary50);
-    font-weight: bold;
     position: relative;
-    padding-left: 1.8rem;
+    padding-left: 20px;
   }
 
   ul {
@@ -72,8 +69,13 @@
     list-style: none;
   }
 
+  .alignment {
+    margin-left: auto;
+    padding-right: 20px;
+  }
+
   li {
-    margin: 0.5rem 0;
+    margin: 0px 0px 10px 0px;
     display: flex;
     align-items: center;
   }
@@ -83,10 +85,11 @@
     padding: 0;
     border: none;
     font-family: Roboto;
-    font-size: 0.8rem;
+    font-size: 12px;
     outline: none;
     cursor: pointer;
     background: rgba(0, 0, 0, 0);
+    text-rendering: optimizeLegibility;
   }
 
   .active {

packages/builder/src/components/nav/HierarchyRow.svelte

@@ -52,8 +52,9 @@
 
 <style>
   .hierarchy-item {
-    font-size: 14px;
+    font-size: 12px;
     font-weight: 400;
+    margin-bottom: 10px;
   }
 
   .capitalized {

packages/builder/src/components/nav/SchemaManagementDrawer.svelte

@@ -55,20 +55,24 @@
     flex-direction: column;
     max-height: 100%;
     height: 100%;
-    background-color: var(--secondary5);
+    background-color: var(--white);
   }
 
   .nav-group-header {
     display: flex;
     justify-content: space-between;
     align-items: center;
-    padding: 2rem 1rem 1rem 1rem;
+    padding: 20px 20px 10px 20px;
   }
 
   .hierarchy-title {
     align-items: center;
     text-transform: uppercase;
-    font-size: 0.85em;
+    font-size: 12px;
+    font-weight: bold;
+    opacity: 0.6;
+    letter-spacing: 1px;
+    text-rendering: optimizeLegibility;
   }
 
   .hierarchy {

packages/builder/src/index.html

@@ -7,6 +7,7 @@
 	<title>Budibase Builder</title>
 
 	<link href="https://cdn.jsdelivr.net/npm/remixicon@2.3.0/fonts/remixicon.css" rel="stylesheet">
+
 	<link rel='icon' type='image/png' href='/_builder/favicon.png'>
 	<link rel='stylesheet' href='/_builder/global.css'>
 	<link rel='stylesheet' href='/_builder/codemirror.css'>

packages/materialdesign-components/components.json

@@ -14,7 +14,9 @@
     "name": "Body1",
     "description": "Sets the font properties as Roboto Body 1",
     "props": {
-      "text": "string"
+      "text": "string",
+      "verticalMargin": "number",
+      "horizontalMargin": "number"
     }, 
     "tags": []
   },

packages/materialdesign-components/public/index.html

@@ -5,9 +5,6 @@
 	<meta name='viewport' content='width=device-width'>
 
 	<title>Budibase-Material Design</title>
-	<link href="https://fonts.googleapis.com/css?family=Roboto:300,400,500" rel="stylesheet">
-	<link href="https://fonts.googleapis.com/icon?family=Material+Icons"
-      rel="stylesheet">
 	<link rel='icon' type='image/png' href='/favicon.png'>
 	<link rel='stylesheet' href='/build/bundle.css'>
 

packages/materialdesign-components/src/Button/Button.svelte

@@ -65,6 +65,9 @@
 {/if}
 
 <style>
+  .mdc-button:not(.fullwidth) {
+    width: fit-content;
+  }
   .fullwidth {
     width: 100%;
   }

packages/materialdesign-components/src/ClassBuilder.js

@@ -1,9 +1,10 @@
 export default class ClassBuilder {
   constructor(block, defaultIgnoreList) {
     this.block = `mdc-${block}`
-    this.defaultIgnoreList = defaultIgnoreList //will be ignored when building custom classes
+    this.defaultIgnoreList = defaultIgnoreList //will be ignored when building custom classes    
   }
 
+
   /* 
   handles both blocks and elementss (BEM MD Notation) 
   params = {elementName: string, props: {modifiers{}, customs:{}, extras: []}}

packages/materialdesign-components/src/Test/TestApp.svelte

@@ -34,6 +34,7 @@
         props: {
           _component: "testcomponents/rootComponent",
           _children: [
+            Button,
             Textfield,
             Checkboxgroup,
             Radiobutton,

packages/materialdesign-components/src/Test/props.js

@@ -35,7 +35,7 @@ export const props = {
   Button: {
     _component: "@budibase/materialdesign-components/Button",
     _children: [],
-    variant: "raised",
+    variant: "text",
     colour: "secondary",
     size: "large",
     href: "",
@@ -64,7 +64,8 @@ export const props = {
     _children: [],
     label: "First",
     colour: "secondary",
-    fullwidth: true,
+    icon: "alarm_on",
+    trailingIcon: true,
     maxLength: 500,
     helperText: "Add Surname",
     value: "store.surname",

packages/materialdesign-components/src/_material-fonts.scss

@@ -0,0 +1,2 @@
+@import "https://fonts.googleapis.com/css?family=Roboto:300,400,500";
+@import "https://fonts.googleapis.com/icon?family=Material+Icons";

packages/materialdesign-components/src/index.js

@@ -1,4 +1,5 @@
 import "@material/theme/mdc-theme.scss"
+import "./_material-fonts.scss"
 
 export { Button } from "./Button"
 export { default as Icon } from "./Common/Icon.svelte"

yarn.lock

@@ -1363,7 +1363,7 @@ caseless@~0.12.0:
   resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
   integrity sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=
 
-chalk@^2.0.0, chalk@^2.1.0, chalk@^2.3.1, chalk@^2.4.2:
+chalk@^2.0.0, chalk@^2.1.0, chalk@^2.3.1, chalk@^2.4.1, chalk@^2.4.2:
   version "2.4.2"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
   integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
@@ -3394,6 +3394,11 @@ mem@^4.0.0:
     mimic-fn "^2.0.0"
     p-is-promise "^2.0.0"
 
+memorystream@^0.3.1:
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/memorystream/-/memorystream-0.3.1.tgz#86d7090b30ce455d63fbae12dda51a47ddcaf9b2"
+  integrity sha1-htcJCzDORV1j+64S3aUaR93K+bI=
+
 meow@^3.3.0:
   version "3.7.0"
   resolved "https://registry.yarnpkg.com/meow/-/meow-3.7.0.tgz#72cb668b425228290abbfa856892587308a801fb"
@@ -3773,6 +3778,21 @@ npm-registry-fetch@^4.0.0:
     npm-package-arg "^6.1.0"
     safe-buffer "^5.2.0"
 
+npm-run-all@^4.1.5:
+  version "4.1.5"
+  resolved "https://registry.yarnpkg.com/npm-run-all/-/npm-run-all-4.1.5.tgz#04476202a15ee0e2e214080861bff12a51d98fba"
+  integrity sha512-Oo82gJDAVcaMdi3nuoKFavkIHBRVqQ1qvMb+9LHk/cF4P6B2m8aP04hGf7oL6wZ9BuGwX1onlLhpuoofSyoQDQ==
+  dependencies:
+    ansi-styles "^3.2.1"
+    chalk "^2.4.1"
+    cross-spawn "^6.0.5"
+    memorystream "^0.3.1"
+    minimatch "^3.0.4"
+    pidtree "^0.3.0"
+    read-pkg "^3.0.0"
+    shell-quote "^1.6.1"
+    string.prototype.padend "^3.0.0"
+
 npm-run-path@^2.0.0:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f"
@@ -4174,6 +4194,11 @@ performance-now@^2.1.0:
   resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
   integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=
 
+pidtree@^0.3.0:
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/pidtree/-/pidtree-0.3.1.tgz#ef09ac2cc0533df1f3250ccf2c4d366b0d12114a"
+  integrity sha512-qQbW94hLHEqCg7nhby4yRC7G2+jYHY4Rguc2bjw7Uug4GIJuu1tvf2uHaZv5Q8zdt+WKJ6qK1FOI6amaWUo5FA==
+
 pify@^2.0.0, pify@^2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
@@ -4688,6 +4713,11 @@ shebang-regex@^1.0.0:
   resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3"
   integrity sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=
 
+shell-quote@^1.6.1:
+  version "1.7.2"
+  resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.7.2.tgz#67a7d02c76c9da24f99d20808fcaded0e0e04be2"
+  integrity sha512-mRz/m/JVscCrkMyPqHc/bczi3OQHkLTqXHEFu0zDhK/qfv3UcOA4SVmRCLmos4bhjr9ekVQubj/R7waKapmiQg==
+
 signal-exit@^3.0.0, signal-exit@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"
@@ -4931,6 +4961,14 @@ string-width@^4.1.0:
     is-fullwidth-code-point "^3.0.0"
     strip-ansi "^6.0.0"
 
+string.prototype.padend@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/string.prototype.padend/-/string.prototype.padend-3.1.0.tgz#dc08f57a8010dc5c153550318f67e13adbb72ac3"
+  integrity sha512-3aIv8Ffdp8EZj8iLwREGpQaUZiPyrWrpzMBHvkiSW/bK/EGve9np07Vwy7IJ5waydpGXzQZu/F8Oze2/IWkBaA==
+  dependencies:
+    define-properties "^1.1.3"
+    es-abstract "^1.17.0-next.1"
+
 string.prototype.trimleft@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/string.prototype.trimleft/-/string.prototype.trimleft-2.1.1.tgz#9bdb8ac6abd6d602b17a4ed321870d2f8dcefc74"