diff --git a/web/src/assets/fonts/Roboto-Regular.ttf b/web/src/assets/fonts/Roboto-Regular.ttf deleted file mode 100644 index 2b6392f..0000000 Binary files a/web/src/assets/fonts/Roboto-Regular.ttf and /dev/null differ diff --git a/web/src/assets/fonts/RopaSans-Regular.ttf b/web/src/assets/fonts/RopaSans-Regular.ttf deleted file mode 100644 index 660a493..0000000 Binary files a/web/src/assets/fonts/RopaSans-Regular.ttf and /dev/null differ diff --git a/web/src/cascade b/web/src/cascade index 62f9612..e634591 160000 --- a/web/src/cascade +++ b/web/src/cascade @@ -1 +1 @@ -Subproject commit 62f961293d72558e59cdcbe0707ef15a06d30c12 +Subproject commit e634591e27dd41fec1638b278be3c298c6ab4b5a diff --git a/web/src/index.css b/web/src/index.css index 7852ba6..eed36d4 100644 --- a/web/src/index.css +++ b/web/src/index.css @@ -8,6 +8,9 @@ @import "tailwindcss/base"; @import "tailwindcss/components"; @import "tailwindcss/utilities"; + +@import url('https://fonts.googleapis.com/css2?family=Ropa+Sans&display=swap'); +@import url('https://fonts.googleapis.com/css2?family=Roboto:ital,wght@0,300;0,500;1,700&display=swap') /** * END --- TAILWIND GENERATOR EDIT */ diff --git a/web/src/layouts/MainLayout/MainLayout.js b/web/src/layouts/MainLayout/MainLayout.js index b3d5a2c..8621647 100644 --- a/web/src/layouts/MainLayout/MainLayout.js +++ b/web/src/layouts/MainLayout/MainLayout.js @@ -22,9 +22,9 @@ const MainLayout = ({ children }) => {
  • -
    -

    CadHub

    -
    pre-alpha
    +
    +

    CadHub

    +
    pre-alpha
  • diff --git a/web/tailwind.config.js b/web/tailwind.config.js index a6d49bf..35fa635 100644 --- a/web/tailwind.config.js +++ b/web/tailwind.config.js @@ -17,8 +17,8 @@ module.exports = { 'md': '28rem' }, fontFamily: { - 'ropa-sans': 'Ropa Sans', - 'roboto': 'Roboto' + 'ropa-sans': ['Ropa Sans', 'Arial', 'sans-serif'], + 'roboto': ['Roboto', 'Arial', 'sans-serif'], }, } },