diff --git a/packages/bbui/src/ActionButton/ActionButton.svelte b/packages/bbui/src/ActionButton/ActionButton.svelte index 4bb592aa26..83f71d385b 100644 --- a/packages/bbui/src/ActionButton/ActionButton.svelte +++ b/packages/bbui/src/ActionButton/ActionButton.svelte @@ -11,6 +11,7 @@ export let icon = "" export let dataCy = null export let size = "M" + export let active = false function longPress(element) { if (!longPressable) return @@ -40,6 +41,7 @@ class:spectrum-ActionButton--emphasized={emphasized} class:is-selected={selected} class="spectrum-ActionButton spectrum-ActionButton--size{size}" + class:active {disabled} on:longPress on:click|preventDefault @@ -67,3 +69,10 @@ {/if} + + diff --git a/packages/bbui/src/Avatar/Avatar.svelte b/packages/bbui/src/Avatar/Avatar.svelte index e23c2fc360..f8acd9024c 100644 --- a/packages/bbui/src/Avatar/Avatar.svelte +++ b/packages/bbui/src/Avatar/Avatar.svelte @@ -39,7 +39,7 @@ color: white; display: grid; place-items: center; - font-weight: 500; + font-weight: 600; background: #3aab87; border-radius: 50%; overflow: hidden; diff --git a/packages/bbui/src/DetailSummary/DetailSummary.svelte b/packages/bbui/src/DetailSummary/DetailSummary.svelte index 1c39bc6aa7..7071ab26d5 100644 --- a/packages/bbui/src/DetailSummary/DetailSummary.svelte +++ b/packages/bbui/src/DetailSummary/DetailSummary.svelte @@ -50,7 +50,7 @@ .name { text-align: left; font-size: 14px; - font-weight: 500; + font-weight: 600; letter-spacing: 0.14px; color: var(--ink); flex: 1 1 auto; diff --git a/packages/bbui/src/Form/Core/Dropzone.svelte b/packages/bbui/src/Form/Core/Dropzone.svelte index 3315c923f8..57f70c8d9a 100644 --- a/packages/bbui/src/Form/Core/Dropzone.svelte +++ b/packages/bbui/src/Form/Core/Dropzone.svelte @@ -285,9 +285,6 @@ --spectrum-global-dimension-font-size-400 ); } - .container * { - font-family: "Inter", sans-serif !important; - } .gallery, .spectrum-Dropzone { @@ -346,7 +343,7 @@ .extension { color: var(--spectrum-global-color-gray-600); text-transform: uppercase; - font-weight: 500; + font-weight: 600; margin-bottom: 5px; } diff --git a/packages/bbui/src/Modal/ModalContent.svelte b/packages/bbui/src/Modal/ModalContent.svelte index b5ed51e943..16338b1ed2 100644 --- a/packages/bbui/src/Modal/ModalContent.svelte +++ b/packages/bbui/src/Modal/ModalContent.svelte @@ -95,7 +95,7 @@ overflow: visible; } .spectrum-Dialog-heading { - font-family: var(--spectrum-alias-body-text-font-family); + font-family: var(--font-sans); } .spectrum-Dialog-buttonGroup { diff --git a/packages/bbui/src/Table/AttachmentRenderer.svelte b/packages/bbui/src/Table/AttachmentRenderer.svelte index 90bb5cce66..797ca93695 100644 --- a/packages/bbui/src/Table/AttachmentRenderer.svelte +++ b/packages/bbui/src/Table/AttachmentRenderer.svelte @@ -49,7 +49,7 @@ border: 1px solid var(--spectrum-global-color-gray-300); border-radius: 2px; text-transform: uppercase; - font-weight: 500; + font-weight: 600; font-size: 11px; } diff --git a/packages/bbui/src/bbui.css b/packages/bbui/src/bbui.css index de758ec7fa..f98f27bf58 100644 --- a/packages/bbui/src/bbui.css +++ b/packages/bbui/src/bbui.css @@ -40,11 +40,6 @@ --rounded-medium: 8px; --rounded-large: 16px; - --font-normal: "Inter"; - --font-black: "Inter Black"; - --font-bold: "Inter Bold"; - --font-medium: "Inter Medium"; - --font-light: "Inter Light"; --font-sans: Source Sans Pro, -apple-system, BlinkMacSystemFont, Segoe UI, "Inter", "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji"; diff --git a/packages/builder/assets/Inter-Black.woff b/packages/builder/assets/Inter-Black.woff deleted file mode 100644 index 07800f4b74..0000000000 Binary files a/packages/builder/assets/Inter-Black.woff and /dev/null differ diff --git a/packages/builder/assets/Inter-Black.woff2 b/packages/builder/assets/Inter-Black.woff2 deleted file mode 100644 index 9a615e6e83..0000000000 Binary files a/packages/builder/assets/Inter-Black.woff2 and /dev/null differ diff --git a/packages/builder/assets/Inter-Bold.woff b/packages/builder/assets/Inter-Bold.woff deleted file mode 100644 index 61e1c25e64..0000000000 Binary files a/packages/builder/assets/Inter-Bold.woff and /dev/null differ diff --git a/packages/builder/assets/Inter-Bold.woff2 b/packages/builder/assets/Inter-Bold.woff2 deleted file mode 100644 index 6c401bb09b..0000000000 Binary files a/packages/builder/assets/Inter-Bold.woff2 and /dev/null differ diff --git a/packages/builder/assets/Inter-ExtraBold.woff b/packages/builder/assets/Inter-ExtraBold.woff deleted file mode 100644 index 433fb3285c..0000000000 Binary files a/packages/builder/assets/Inter-ExtraBold.woff and /dev/null differ diff --git a/packages/builder/assets/Inter-ExtraBold.woff2 b/packages/builder/assets/Inter-ExtraBold.woff2 deleted file mode 100644 index 5a08b364d5..0000000000 Binary files a/packages/builder/assets/Inter-ExtraBold.woff2 and /dev/null differ diff --git a/packages/builder/assets/Inter-Medium.woff b/packages/builder/assets/Inter-Medium.woff deleted file mode 100644 index 8c36a6345e..0000000000 Binary files a/packages/builder/assets/Inter-Medium.woff and /dev/null differ diff --git a/packages/builder/assets/Inter-Medium.woff2 b/packages/builder/assets/Inter-Medium.woff2 deleted file mode 100644 index 3b31d3350a..0000000000 Binary files a/packages/builder/assets/Inter-Medium.woff2 and /dev/null differ diff --git a/packages/builder/assets/Inter-Regular.woff b/packages/builder/assets/Inter-Regular.woff deleted file mode 100644 index 7d587c40bf..0000000000 Binary files a/packages/builder/assets/Inter-Regular.woff and /dev/null differ diff --git a/packages/builder/assets/Inter-Regular.woff2 b/packages/builder/assets/Inter-Regular.woff2 deleted file mode 100644 index d5ffd2a1f1..0000000000 Binary files a/packages/builder/assets/Inter-Regular.woff2 and /dev/null differ diff --git a/packages/builder/assets/Inter-SemiBold.woff b/packages/builder/assets/Inter-SemiBold.woff deleted file mode 100644 index 99df06cbee..0000000000 Binary files a/packages/builder/assets/Inter-SemiBold.woff and /dev/null differ diff --git a/packages/builder/assets/Inter-SemiBold.woff2 b/packages/builder/assets/Inter-SemiBold.woff2 deleted file mode 100644 index df746af999..0000000000 Binary files a/packages/builder/assets/Inter-SemiBold.woff2 and /dev/null differ diff --git a/packages/builder/assets/banner-image.png b/packages/builder/assets/banner-image.png deleted file mode 100644 index 3531495668..0000000000 Binary files a/packages/builder/assets/banner-image.png and /dev/null differ diff --git a/packages/builder/assets/bb-logo.svg b/packages/builder/assets/bb-logo.svg deleted file mode 100644 index 7d115faefc..0000000000 --- a/packages/builder/assets/bb-logo.svg +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - - - diff --git a/packages/builder/assets/budibase-logo.svg b/packages/builder/assets/budibase-logo.svg deleted file mode 100644 index 66b5b3bb39..0000000000 --- a/packages/builder/assets/budibase-logo.svg +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - - - - - - - - - diff --git a/packages/builder/assets/deploy-rocket.jpg b/packages/builder/assets/deploy-rocket.jpg deleted file mode 100644 index 497afe87af..0000000000 Binary files a/packages/builder/assets/deploy-rocket.jpg and /dev/null differ diff --git a/packages/builder/assets/orange-landscape.png b/packages/builder/assets/orange-landscape.png deleted file mode 100644 index d96fc315e6..0000000000 Binary files a/packages/builder/assets/orange-landscape.png and /dev/null differ diff --git a/packages/builder/assets/remixicon.woff b/packages/builder/assets/remixicon.woff deleted file mode 100644 index 62a756bd30..0000000000 Binary files a/packages/builder/assets/remixicon.woff and /dev/null differ diff --git a/packages/builder/assets/remixicon.woff2 b/packages/builder/assets/remixicon.woff2 deleted file mode 100644 index 89a0b99ec6..0000000000 Binary files a/packages/builder/assets/remixicon.woff2 and /dev/null differ diff --git a/packages/builder/index.html b/packages/builder/index.html index 3dc078182c..eb58dc74d2 100644 --- a/packages/builder/index.html +++ b/packages/builder/index.html @@ -4,7 +4,12 @@ Budibase - + + + diff --git a/packages/builder/src/budibase.css b/packages/builder/src/budibase.css deleted file mode 100644 index 1426a7beed..0000000000 --- a/packages/builder/src/budibase.css +++ /dev/null @@ -1,157 +0,0 @@ -/* Budibase Component Styles */ - - -.budibase__title { - font-weight: 900; - font-size: 42px; -} - -.budibase__title--2 { - font-weight: 700; - font-size: 32px; -} - -.budibase__title--3 { - font-weight: 700; - font-size: 24px; -} - -.budibase__title--4 { - font-weight: 700; - font-size: 18px; -} - -.budibase__label--big { - font-weight: 400; - font-size: 14px; - opacity: 0.6; - text-transform: uppercase; -} - -.budibase__label--medium { - font-weight: 500; - font-size: 13px; - opacity: 0.6; - text-transform: uppercase; -} - -.budibase__label--small { - font-weight: 500; - font-size: 10px; - opacity: 0.6; - text-transform: uppercase; -} - -.budibase__sub-heading { - font-weight: 500; - font-size: 16px; - opacity: 0.6; -} - -.budibase__nav-item { - cursor: pointer; - padding: 0 4px 0 2px; - height: 36px; - margin: 0px 0px 0px 0px; - border-radius: 5px; - display: flex; - align-items: center; - font-size: 14px; - transition: 0.2s; - border-top: var(--grey-1) .5px solid; -} - -.budibase__nav-item.selected { - color: var(--ink); - background: var(--grey-2); -} - -.budibase__nav-item:hover { - background: var(--grey-1); -} - -.budibase__input { - height: 36px; - background-color: var(--grey-2); - border: none; - border-radius: 5px; - width: 100%; - text-align: left; - color: var(--ink); - font-size: 14px; - padding-left: 8px; - -moz-box-sizing: border-box; - -webkit-box-sizing: border-box; - box-sizing: border-box; -} - -.budibase__table { - border: 1px solid var(--grey-4); - background: #fff; - border-radius: 2px; -} - -.budibase__table thead { - background: var(--blue-light); -} - -.budibase__table thead > tr > th { - color: var(--ink); - text-transform: capitalize; - font-weight: 500; -} - -.budibase__table tr { - border-bottom: 1px solid var(--grey-1); -} - -.button--toggled { - background: var(--blue-light); - color: var(--grey-7); - width: 40px; - height: 40px; - display: flex; - align-items: center; - justify-content: center; - font-size: 20px; -} - -/* Table styles */ -.bb-table { - border-collapse: collapse; - border-spacing: 0; - width: 100%; - margin-bottom: var(--spacing-xl); -} - -* + .bb-table { - margin-top: var(--spacing-xl) -} - -.bb-table th { - padding: var(--spacing-l) var(--spacing-m); - text-align: left; - vertical-align: bottom; -} - -.bb-table td { - padding: var(--spacing-l) var(--spacing-m); - vertical-align: top; -} - -.bb-table td > :last-child { margin-bottom: 0; } - -.bb__alert { - position: relative; - margin-bottom: var(--spacing-m); - padding: var(--spacing-l); -} - -.bb__alert--danger { - background: #fef4f6; - color: #f0506e; -} - -a { - text-decoration: none; -} \ No newline at end of file diff --git a/packages/builder/src/builderStore/store/screenTemplates/rowDetailScreen.js b/packages/builder/src/builderStore/store/screenTemplates/rowDetailScreen.js index d06cb4000e..b0cf694a5d 100644 --- a/packages/builder/src/builderStore/store/screenTemplates/rowDetailScreen.js +++ b/packages/builder/src/builderStore/store/screenTemplates/rowDetailScreen.js @@ -32,8 +32,7 @@ function generateTitleContainer(table, title, formId, repeaterId) { "border-width": "0", "border-style": "None", color: "#fff", - "font-family": "Inter", - "font-weight": "500", + "font-weight": "600", "font-size": "14px", }) @@ -43,8 +42,7 @@ function generateTitleContainer(table, title, formId, repeaterId) { "border-width": "0", "border-style": "None", color: "#9e9e9e", - "font-family": "Inter", - "font-weight": "500", + "font-weight": "600", "font-size": "14px", "margin-right": "8px", "margin-left": "16px", diff --git a/packages/builder/src/builderStore/store/screenTemplates/rowListScreen.js b/packages/builder/src/builderStore/store/screenTemplates/rowListScreen.js index 7318b3a13d..f31c4c12d2 100644 --- a/packages/builder/src/builderStore/store/screenTemplates/rowListScreen.js +++ b/packages/builder/src/builderStore/store/screenTemplates/rowListScreen.js @@ -24,8 +24,7 @@ function generateTitleContainer(table) { "border-width": "0", "border-style": "None", color: "#fff", - "font-family": "Inter", - "font-weight": "500", + "font-weight": "600", "font-size": "14px", }) .hoverStyle({ @@ -52,7 +51,7 @@ function generateTitleContainer(table) { flex: "1 1 auto", "text-transform": "capitalize", }) - .type("h3") + .type("h2") .instanceName("Title") .text(table.name) @@ -111,8 +110,7 @@ const createScreen = table => { .instanceName("View Button") .normalStyle({ background: "transparent", - "font-family": "Inter, sans-serif", - "font-weight": "500", + "font-weight": "600", color: "#888", "border-width": "0", }) diff --git a/packages/builder/src/builderStore/store/screenTemplates/utils/commonComponents.js b/packages/builder/src/builderStore/store/screenTemplates/utils/commonComponents.js index 19f950226c..02b3c20a2f 100644 --- a/packages/builder/src/builderStore/store/screenTemplates/utils/commonComponents.js +++ b/packages/builder/src/builderStore/store/screenTemplates/utils/commonComponents.js @@ -97,8 +97,7 @@ export function makeSaveButton(table, formId) { "border-width": "0", "border-style": "None", color: "#fff", - "font-family": "Inter", - "font-weight": "500", + "font-weight": "600", "font-size": "14px", "margin-left": "16px", }) @@ -145,7 +144,7 @@ export function makeTitleContainer(title) { flex: "1 1 auto", }) .customStyle(spectrumColor(900)) - .type("h3") + .type("h2") .instanceName("Title") .text(title) diff --git a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItem.svelte b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItem.svelte index 6f8a31d68d..46385db6c3 100644 --- a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItem.svelte +++ b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItem.svelte @@ -67,7 +67,7 @@ header { font-size: 16px; - font-weight: 500; + font-weight: 600; display: flex; flex-direction: row; justify-content: flex-start; diff --git a/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte b/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte index 175160ba64..f2f1dbe174 100644 --- a/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte +++ b/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte @@ -130,7 +130,7 @@ } .block-label { - font-weight: 500; + font-weight: 600; font-size: var(--font-size-s); color: var(--grey-7); } diff --git a/packages/builder/src/components/automation/SetupPanel/QueryParamSelector.svelte b/packages/builder/src/components/automation/SetupPanel/QueryParamSelector.svelte index 02d89505de..3cdce4eb1d 100644 --- a/packages/builder/src/components/automation/SetupPanel/QueryParamSelector.svelte +++ b/packages/builder/src/components/automation/SetupPanel/QueryParamSelector.svelte @@ -16,12 +16,13 @@
- + -
- -
- -
- - - - - {#if error} -
Incorrect email or password
- {/if} - - - - diff --git a/packages/standard-components/src/Navigation.svelte b/packages/standard-components/src/Navigation.svelte index b0f043b75c..43d8a0fa2a 100644 --- a/packages/standard-components/src/Navigation.svelte +++ b/packages/standard-components/src/Navigation.svelte @@ -5,16 +5,22 @@ const component = getContext("component") export let logoUrl + export let hideLogo
-
- - {#if logoUrl} - - {/if} - -
+ {#if !hideLogo} +
+ + + +
+ {/if}
@@ -33,6 +39,7 @@ flex-direction: row; justify-content: space-between; align-items: center; + margin-bottom: 40px; } .nav__top img { margin-right: 16px; @@ -52,7 +59,6 @@ .nav__menu { display: flex; - margin-top: 40px; flex-direction: row; justify-content: flex-start; align-items: center; diff --git a/packages/standard-components/src/index.js b/packages/standard-components/src/index.js index 7b4d492fa9..1c176f3645 100644 --- a/packages/standard-components/src/index.js +++ b/packages/standard-components/src/index.js @@ -18,7 +18,6 @@ export { default as repeater } from "./Repeater.svelte" export { default as stackedlist } from "./StackedList.svelte" export { default as card } from "./Card.svelte" export { default as text } from "./Text.svelte" -export { default as login } from "./Login.svelte" export { default as navigation } from "./Navigation.svelte" export { default as link } from "./Link.svelte" export { default as heading } from "./Heading.svelte"