diff --git a/packages/bbui/src/Form/Core/Dropzone.svelte b/packages/bbui/src/Form/Core/Dropzone.svelte index 3315c923f8..34215d5013 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 { 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/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/builderStore/store/screenTemplates/rowDetailScreen.js b/packages/builder/src/builderStore/store/screenTemplates/rowDetailScreen.js index d06cb4000e..ab08cc00a0 100644 --- a/packages/builder/src/builderStore/store/screenTemplates/rowDetailScreen.js +++ b/packages/builder/src/builderStore/store/screenTemplates/rowDetailScreen.js @@ -32,7 +32,6 @@ function generateTitleContainer(table, title, formId, repeaterId) { "border-width": "0", "border-style": "None", color: "#fff", - "font-family": "Inter", "font-weight": "500", "font-size": "14px", }) @@ -43,7 +42,6 @@ function generateTitleContainer(table, title, formId, repeaterId) { "border-width": "0", "border-style": "None", color: "#9e9e9e", - "font-family": "Inter", "font-weight": "500", "font-size": "14px", "margin-right": "8px", diff --git a/packages/builder/src/builderStore/store/screenTemplates/rowListScreen.js b/packages/builder/src/builderStore/store/screenTemplates/rowListScreen.js index 7318b3a13d..aeda47258c 100644 --- a/packages/builder/src/builderStore/store/screenTemplates/rowListScreen.js +++ b/packages/builder/src/builderStore/store/screenTemplates/rowListScreen.js @@ -24,7 +24,6 @@ function generateTitleContainer(table) { "border-width": "0", "border-style": "None", color: "#fff", - "font-family": "Inter", "font-weight": "500", "font-size": "14px", }) @@ -111,7 +110,6 @@ const createScreen = table => { .instanceName("View Button") .normalStyle({ background: "transparent", - "font-family": "Inter, sans-serif", "font-weight": "500", 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..331938f11a 100644 --- a/packages/builder/src/builderStore/store/screenTemplates/utils/commonComponents.js +++ b/packages/builder/src/builderStore/store/screenTemplates/utils/commonComponents.js @@ -97,7 +97,6 @@ export function makeSaveButton(table, formId) { "border-width": "0", "border-style": "None", color: "#fff", - "font-family": "Inter", "font-weight": "500", "font-size": "14px", "margin-left": "16px", diff --git a/packages/builder/src/components/design/AppPreview/iframeTemplate.js b/packages/builder/src/components/design/AppPreview/iframeTemplate.js index dc4b1e3af9..da39a6477b 100644 --- a/packages/builder/src/components/design/AppPreview/iframeTemplate.js +++ b/packages/builder/src/components/design/AppPreview/iframeTemplate.js @@ -1,15 +1,28 @@ export default ` - - + + + + diff --git a/packages/builder/src/components/design/PropertiesPanel/componentStyles.js b/packages/builder/src/components/design/PropertiesPanel/componentStyles.js index ba46738549..3388d1772d 100644 --- a/packages/builder/src/components/design/PropertiesPanel/componentStyles.js +++ b/packages/builder/src/components/design/PropertiesPanel/componentStyles.js @@ -386,8 +386,7 @@ export const typography = [ { label: "Impact", value: "Impact" }, { label: "Inter", value: "Inter" }, { label: "Lucida Sans Unicode", value: "Lucida Sans Unicode" }, - { label: "Roboto", value: "Roboto" }, - { label: "Roboto Mono", value: "Roboto Mono" }, + { label: "Source Sans Pro", value: "Source Sans Pro" }, { label: "Times New Roman", value: "Times New Roman" }, { label: "Verdana", value: "Verdana" }, ], diff --git a/packages/builder/src/fonts.css b/packages/builder/src/fonts.css deleted file mode 100644 index f205bb91e7..0000000000 --- a/packages/builder/src/fonts.css +++ /dev/null @@ -1,56 +0,0 @@ -/* latin-ext */ -/* Inter-regular - latin-ext_latin */ -@font-face { - font-family: 'Inter'; - font-style: normal; - font-weight: 400; - src: local('Inter'), local('Inter-Regular'), - url('/assets/Inter-Regular.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */ - url('/assets/Inter-Regular.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */ -} -/* Inter-500 - latin-ext_latin */ -@font-face { - font-family: 'Inter'; - font-style: normal; - font-weight: 500; - src: local('Inter Medium'), local('Inter-Medium'), - url('/assets/Inter-Medium.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */ - url('/assets/Inter-Medium.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */ -} -/* Inter-600 - latin-ext_latin */ -@font-face { - font-family: 'Inter'; - font-style: normal; - font-weight: 600; - src: local('Inter SemiBold'), local('Inter-SemiBold'), - url('/assets/Inter-SemiBold.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */ - url('/assets/Inter-SemiBold.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */ -} -/* Inter-700 - latin-ext_latin */ -@font-face { - font-family: 'Inter'; - font-style: normal; - font-weight: 700; - src: local('Inter Bold'), local('Inter-Bold'), - url('/assets/Inter-Bold.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */ - url('/assets/Inter-Bold.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */ -} -/* Inter-800 - latin-ext_latin */ -@font-face { - font-family: 'Inter'; - font-style: normal; - font-weight: 700; - src: local('Inter ExtraBold'), local('Inter-ExtraBold'), - url('/assets/Inter-ExtraBold.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */ - url('/assets/Inter-ExtraBold.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */ -} -/* Inter-900 - latin-ext_latin */ -@font-face { - font-family: 'Inter'; - font-style: normal; - font-weight: 900; - src: local('Inter Black'), local('Inter-Black'), - url('/assets/Inter-Black.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */ - url('/assets/Inter-Black.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */ -} - \ No newline at end of file diff --git a/packages/builder/src/main.js b/packages/builder/src/main.js index e55ec78496..6b78f79476 100644 --- a/packages/builder/src/main.js +++ b/packages/builder/src/main.js @@ -7,9 +7,7 @@ import "@spectrum-css/vars/dist/spectrum-light.css" import "@spectrum-css/vars/dist/spectrum-lightest.css" import "@spectrum-css/page/dist/index-vars.css" import "./global.css" -import "./fonts.css" import "./budibase.css" -import "./fonts.css" import loadSpectrumIcons from "@budibase/bbui/spectrum-icons-vite.js" loadSpectrumIcons() diff --git a/packages/builder/src/pages/builder/auth/_components/GoogleButton.svelte b/packages/builder/src/pages/builder/auth/_components/GoogleButton.svelte index c9c459b1f3..ef755e0760 100644 --- a/packages/builder/src/pages/builder/auth/_components/GoogleButton.svelte +++ b/packages/builder/src/pages/builder/auth/_components/GoogleButton.svelte @@ -1,7 +1,6 @@