diff --git a/packages/frontend-2/assets/css/fonts.css b/packages/frontend-2/assets/css/fonts.css deleted file mode 100644 index 77175de45..000000000 --- a/packages/frontend-2/assets/css/fonts.css +++ /dev/null @@ -1,74 +0,0 @@ -/* cyrillic-ext */ -@font-face { - font-family: 'Inter'; - font-style: normal; - font-weight: 100 900; - font-display: swap; - src: url('~@speckle/tailwind-theme/fonts/inter-cyrillic-ext.ttf') format('woff2'); - unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F; -} - -/* cyrillic */ -@font-face { - font-family: 'Inter'; - font-style: normal; - font-weight: 100 900; - font-display: swap; - src: url('~@speckle/tailwind-theme/fonts/inter-cyrillic.ttf') format('woff2'); - unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116; -} - -/* greek-ext */ -@font-face { - font-family: 'Inter'; - font-style: normal; - font-weight: 100 900; - font-display: swap; - src: url('~@speckle/tailwind-theme/fonts/inter-greek-ext.ttf') format('woff2'); - unicode-range: U+1F00-1FFF; -} - -/* greek */ -@font-face { - font-family: 'Inter'; - font-style: normal; - font-weight: 100 900; - font-display: swap; - src: url('~@speckle/tailwind-theme/fonts/inter-greek.ttf') format('woff2'); - unicode-range: U+0370-0377, U+037A-037F, U+0384-038A, U+038C, U+038E-03A1, U+03A3-03FF; -} - -/* vietnamese */ -@font-face { - font-family: 'Inter'; - font-style: normal; - font-weight: 100 900; - font-display: swap; - src: url('~@speckle/tailwind-theme/fonts/inter-vietnamese.ttf') format('woff2'); - unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, - U+01AF-01B0, U+0300-0301, U+0303-0304, U+0308-0309, U+0323, U+0329, U+1EA0-1EF9, - U+20AB; -} - -/* latin-ext */ -@font-face { - font-family: 'Inter'; - font-style: normal; - font-weight: 100 900; - font-display: swap; - src: url('~@speckle/tailwind-theme/fonts/inter-latin-ext.ttf') format('woff2'); - unicode-range: U+0100-02AF, U+0304, U+0308, U+0329, U+1E00-1E9F, U+1EF2-1EFF, U+2020, - U+20A0-20AB, U+20AD-20C0, U+2113, U+2C60-2C7F, U+A720-A7FF; -} - -/* latin */ -@font-face { - font-family: 'Inter'; - font-style: normal; - font-weight: 100 900; - font-display: swap; - src: url('~@speckle/tailwind-theme/fonts/inter-latin.ttf') format('woff2'); - unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, - U+0304, U+0308, U+0329, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, - U+2215, U+FEFF, U+FFFD; -} diff --git a/packages/frontend-2/assets/css/tailwind.css b/packages/frontend-2/assets/css/tailwind.css index 18896665f..7b094ca40 100644 --- a/packages/frontend-2/assets/css/tailwind.css +++ b/packages/frontend-2/assets/css/tailwind.css @@ -1,6 +1,5 @@ /* stylelint-disable selector-id-pattern */ @import '@speckle/ui-components/style.css'; -@import './fonts.css'; @tailwind base; @tailwind components; @tailwind utilities; diff --git a/packages/tailwind-theme/src/plugin.ts b/packages/tailwind-theme/src/plugin.ts index 34fd35ebf..05493fa8f 100644 --- a/packages/tailwind-theme/src/plugin.ts +++ b/packages/tailwind-theme/src/plugin.ts @@ -118,6 +118,95 @@ export const darkThemeVariables = { } export default plugin(function ({ addComponents, addBase }) { + addBase({ + /* cyrillic-ext */ + '@font-face': { + fontFamily: 'Inter', + fontStyle: 'normal', + fontWeight: '100 900', + fontDisplay: 'swap', + src: "url('@speckle/tailwind-theme/fonts/inter-cyrillic-ext.woff2') format('woff2')", + unicodeRange: + 'U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F' + } + }) + + addBase({ + /* cyrillic */ + '@font-face': { + fontFamily: 'Inter', + fontStyle: 'normal', + fontWeight: '100 900', + fontDisplay: 'swap', + src: "url('@speckle/tailwind-theme/fonts/inter-cyrillic.woff2') format('woff2')", + unicodeRange: 'U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116' + } + }) + + addBase({ + /* greek-ext */ + '@font-face': { + fontFamily: 'Inter', + fontStyle: 'normal', + fontWeight: '100 900', + fontDisplay: 'swap', + src: "url('@speckle/tailwind-theme/fonts/inter-greek-ext.woff2') format('woff2')", + unicodeRange: 'U+1F00-1FFF' + } + }) + + addBase({ + /* greek */ + '@font-face': { + fontFamily: 'Inter', + fontStyle: 'normal', + fontWeight: '100 900', + fontDisplay: 'swap', + src: "url('@speckle/tailwind-theme/fonts/inter-greek.woff2') format('woff2')", + unicodeRange: + 'U+0370-0377, U+037A-037F, U+0384-038A, U+038C, U+038E-03A1, U+03A3-03FF' + } + }) + + addBase({ + /* vietnamese */ + '@font-face': { + fontFamily: 'Inter', + fontStyle: 'normal', + fontWeight: '100 900', + fontDisplay: 'swap', + src: "url('@speckle/tailwind-theme/fonts/inter-vietnamese.woff2') format('woff2')", + unicodeRange: + 'U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+0300-0301, U+0303-0304, U+0308-0309, U+0323, U+0329, U+1EA0-1EF9, U+20AB' + } + }) + + addBase({ + /* latin-ext */ + '@font-face': { + fontFamily: 'Inter', + fontStyle: 'normal', + fontWeight: '100 900', + fontDisplay: 'swap', + src: "url('@speckle/tailwind-theme/fonts/inter-latin-ext.woff2') format('woff2')", + unicodeRange: + 'U+0100-02AF, U+0304, U+0308, U+0329, U+1E00-1E9F, U+1EF2-1EFF, U+2020, U+20A0-20AB, U+20AD-20C0, U+2113, U+2C60-2C7F, U+A720-A7FF' + } + }) + + addBase({ + /* latin */ + '@font-face': { + fontFamily: 'Inter', + fontStyle: 'normal', + fontWeight: '100 900', + fontDisplay: 'swap', + src: "url('@speckle/tailwind-theme/fonts/inter-latin.woff2') format('woff2')", + unicodeRange: + 'U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD' + } + }) + addBase({ "[type='checkbox']:focus, [type='radio']:focus": { '@apply ring-offset-foundation': {} diff --git a/packages/ui-components/src/assets/setup/fonts.css b/packages/ui-components/src/assets/setup/fonts.css deleted file mode 100644 index e69de29bb..000000000