From dcb532dd6457afe14c7631464adfcb794b32e038 Mon Sep 17 00:00:00 2001 From: Joe <49767913+joebudi@users.noreply.github.com> Date: Fri, 29 May 2020 09:20:29 +0100 Subject: [PATCH 1/6] Font numerical weights added and line decorations added --- .../userInterface/propertyCategories.js | 29 ++++++++++++++++--- 1 file changed, 25 insertions(+), 4 deletions(-) diff --git a/packages/builder/src/components/userInterface/propertyCategories.js b/packages/builder/src/components/userInterface/propertyCategories.js index dde62f7e5a..831caf0730 100644 --- a/packages/builder/src/components/userInterface/propertyCategories.js +++ b/packages/builder/src/components/userInterface/propertyCategories.js @@ -167,10 +167,16 @@ export const typography = [ key: "font-weight", control: OptionSelect, options: [ - { label: "normal" }, - { label: "bold" }, - { label: "bolder" }, - { label: "lighter" }, + { label: "100", value:"100"}, + { label: "200", value:"200"}, + { label: "300", value:"300"}, + { label: "400", value:"400"}, + { label: "500", value:"500"}, + { label: "600", value:"600"}, + { label: "700", value:"700"}, + { label: "800", value:"800"}, + { label: "900", value:"900"}, + ], }, { label: "size", key: "font-size", defaultValue: "", control: Input }, @@ -186,6 +192,21 @@ export const typography = [ control: OptionSelect, options: ["initial", "left", "right", "center", "justify"], }, //custom + { + label: "Decoration", + key: "text-decoration-line", + control: OptionSelect, + defaultValue: "Underline", + options: [ + {label: "Underline", value: "underline"}, + {label: "None", value: "none"}, + {label: "Overline", value: "overline"}, + {label: "Line-through", value: "line-through"}, + {label: "Under Over", value: "underline overline"}, + + ], + }, + { label: "transform", key: "text-transform", control: Input }, //custom { label: "style", key: "font-style", control: Input }, //custom ] From 0ece54f1850c54b61a86ca7f9f78b97de9e5c6f4 Mon Sep 17 00:00:00 2001 From: Joe <49767913+joebudi@users.noreply.github.com> Date: Fri, 29 May 2020 09:39:47 +0100 Subject: [PATCH 2/6] Update propertyCategories.js --- .../userInterface/propertyCategories.js | 32 +++++++++---------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/packages/builder/src/components/userInterface/propertyCategories.js b/packages/builder/src/components/userInterface/propertyCategories.js index 831caf0730..eaa2f41245 100644 --- a/packages/builder/src/components/userInterface/propertyCategories.js +++ b/packages/builder/src/components/userInterface/propertyCategories.js @@ -167,16 +167,15 @@ export const typography = [ key: "font-weight", control: OptionSelect, options: [ - { label: "100", value:"100"}, - { label: "200", value:"200"}, - { label: "300", value:"300"}, - { label: "400", value:"400"}, - { label: "500", value:"500"}, - { label: "600", value:"600"}, - { label: "700", value:"700"}, - { label: "800", value:"800"}, - { label: "900", value:"900"}, - + { label: "100", value: "100" }, + { label: "200", value: "200" }, + { label: "300", value: "300" }, + { label: "400", value: "400" }, + { label: "500", value: "500" }, + { label: "600", value: "600" }, + { label: "700", value: "700" }, + { label: "800", value: "800" }, + { label: "900", value: "900" }, ], }, { label: "size", key: "font-size", defaultValue: "", control: Input }, @@ -198,14 +197,13 @@ export const typography = [ control: OptionSelect, defaultValue: "Underline", options: [ - {label: "Underline", value: "underline"}, - {label: "None", value: "none"}, - {label: "Overline", value: "overline"}, - {label: "Line-through", value: "line-through"}, - {label: "Under Over", value: "underline overline"}, - + { label: "Underline", value: "underline" }, + { label: "None", value: "none" }, + { label: "Overline", value: "overline" }, + { label: "Line-through", value: "line-through" }, + { label: "Under Over", value: "underline overline" }, ], - }, + }, { label: "transform", key: "text-transform", control: Input }, //custom { label: "style", key: "font-style", control: Input }, //custom From bc42d199534b023422a2aecdf3ac5f74f6e829ea Mon Sep 17 00:00:00 2001 From: Joe <49767913+joebudi@users.noreply.github.com> Date: Fri, 29 May 2020 10:57:00 +0100 Subject: [PATCH 3/6] Cleaning up the panel UI by removing inner borders --- .../builder/src/components/nav/BackendNav.svelte | 1 - .../userInterface/UserInterfaceRoot.svelte | 16 ++-------------- .../pages/[application]/frontend/_layout.svelte | 3 --- 3 files changed, 2 insertions(+), 18 deletions(-) diff --git a/packages/builder/src/components/nav/BackendNav.svelte b/packages/builder/src/components/nav/BackendNav.svelte index 8a7fd6bb90..173e92d98b 100644 --- a/packages/builder/src/components/nav/BackendNav.svelte +++ b/packages/builder/src/components/nav/BackendNav.svelte @@ -45,7 +45,6 @@ -
{#if $backendUiStore.selectedDatabase._id}
diff --git a/packages/builder/src/components/userInterface/UserInterfaceRoot.svelte b/packages/builder/src/components/userInterface/UserInterfaceRoot.svelte index 13d7a7e2a1..f4581286df 100644 --- a/packages/builder/src/components/userInterface/UserInterfaceRoot.svelte +++ b/packages/builder/src/components/userInterface/UserInterfaceRoot.svelte @@ -42,7 +42,6 @@
Navigator -
Pages
@@ -52,11 +51,9 @@
-
-
@@ -114,21 +111,12 @@ .root { display: grid; - grid-template-columns: 275px 1fr 300px; + grid-template-columns: 300px 1fr 300px; height: 100%; width: 100%; - background: #fafafa; + background: #FBFBFB; } - @media only screen and (min-width: 1800px) { - .root { - display: grid; - grid-template-columns: 300px 1fr 300px; - height: 100%; - width: 100%; - background: #fafafa; - } - } .ui-nav { grid-column: 1; diff --git a/packages/builder/src/pages/[application]/frontend/_layout.svelte b/packages/builder/src/pages/[application]/frontend/_layout.svelte index c480a75bfa..9042301cd6 100644 --- a/packages/builder/src/pages/[application]/frontend/_layout.svelte +++ b/packages/builder/src/pages/[application]/frontend/_layout.svelte @@ -63,12 +63,9 @@
-
-
-
From e024ec7b93daf789907fab79e60deafa73a1e934 Mon Sep 17 00:00:00 2001 From: Joe <49767913+joebudi@users.noreply.github.com> Date: Fri, 29 May 2020 13:24:33 +0100 Subject: [PATCH 4/6] Media queries removed --- .../src/pages/[application]/backend/_layout.svelte | 10 +--------- .../src/pages/[application]/frontend/_layout.svelte | 11 +---------- 2 files changed, 2 insertions(+), 19 deletions(-) diff --git a/packages/builder/src/pages/[application]/backend/_layout.svelte b/packages/builder/src/pages/[application]/backend/_layout.svelte index 069e720b17..84b09986fa 100644 --- a/packages/builder/src/pages/[application]/backend/_layout.svelte +++ b/packages/builder/src/pages/[application]/backend/_layout.svelte @@ -34,16 +34,8 @@ .nav { overflow: auto; flex: 0 1 auto; - width: 275px; + width: 300px; height: 100%; } - @media only screen and (min-width: 1800px) { - .nav { - overflow: auto; - flex: 0 1 auto; - width: 300px; - height: 100%; - } - } diff --git a/packages/builder/src/pages/[application]/frontend/_layout.svelte b/packages/builder/src/pages/[application]/frontend/_layout.svelte index 9042301cd6..9adf71987f 100644 --- a/packages/builder/src/pages/[application]/frontend/_layout.svelte +++ b/packages/builder/src/pages/[application]/frontend/_layout.svelte @@ -123,20 +123,11 @@ .root { display: grid; - grid-template-columns: 275px 1fr 275px; + grid-template-columns: 300px 1fr 300px; width: 100%; background: var(--grey-light); } - @media only screen and (min-width: 1800px) { - .root { - display: grid; - grid-template-columns: 300px 1fr 300px; - width: 100%; - background: var(--grey-light); - } - } - .ui-nav { grid-column: 1; background-color: var(--white); From 020d9c884da06551f102bf6a95acb9946b803a82 Mon Sep 17 00:00:00 2001 From: Joe <49767913+joebudi@users.noreply.github.com> Date: Fri, 29 May 2020 13:25:27 +0100 Subject: [PATCH 5/6] formatting --- .../src/components/userInterface/UserInterfaceRoot.svelte | 5 +---- .../builder/src/pages/[application]/backend/_layout.svelte | 1 - .../builder/src/pages/[application]/frontend/_layout.svelte | 1 - 3 files changed, 1 insertion(+), 6 deletions(-) diff --git a/packages/builder/src/components/userInterface/UserInterfaceRoot.svelte b/packages/builder/src/components/userInterface/UserInterfaceRoot.svelte index f4581286df..8b600047d8 100644 --- a/packages/builder/src/components/userInterface/UserInterfaceRoot.svelte +++ b/packages/builder/src/components/userInterface/UserInterfaceRoot.svelte @@ -51,10 +51,8 @@
- -
@@ -114,10 +112,9 @@ grid-template-columns: 300px 1fr 300px; height: 100%; width: 100%; - background: #FBFBFB; + background: #fbfbfb; } - .ui-nav { grid-column: 1; background-color: var(--white); diff --git a/packages/builder/src/pages/[application]/backend/_layout.svelte b/packages/builder/src/pages/[application]/backend/_layout.svelte index 84b09986fa..0e36980c6c 100644 --- a/packages/builder/src/pages/[application]/backend/_layout.svelte +++ b/packages/builder/src/pages/[application]/backend/_layout.svelte @@ -37,5 +37,4 @@ width: 300px; height: 100%; } - diff --git a/packages/builder/src/pages/[application]/frontend/_layout.svelte b/packages/builder/src/pages/[application]/frontend/_layout.svelte index 9adf71987f..a8cbf56efd 100644 --- a/packages/builder/src/pages/[application]/frontend/_layout.svelte +++ b/packages/builder/src/pages/[application]/frontend/_layout.svelte @@ -63,7 +63,6 @@
-
From bd85079b268f77c56dbb58f040eaee98e2bb0ddf Mon Sep 17 00:00:00 2001 From: Joe <49767913+joebudi@users.noreply.github.com> Date: Fri, 29 May 2020 13:56:57 +0100 Subject: [PATCH 6/6] the alert button ui was off and the red is too serious --- .../components/common/AppNotification.svelte | 29 ++++++++++--------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/packages/builder/src/components/common/AppNotification.svelte b/packages/builder/src/components/common/AppNotification.svelte index e4a43247c9..85c6d30a2b 100644 --- a/packages/builder/src/components/common/AppNotification.svelte +++ b/packages/builder/src/components/common/AppNotification.svelte @@ -5,7 +5,7 @@ UIKit.notification({ message: `
- +
🤯
${message} @@ -21,6 +21,7 @@