Replace fonts

.github/workflows/docker_build.yml

@@ -48,6 +48,8 @@ jobs:
           context: .
           platforms: linux/amd64,linux/arm64
           file: docker-builds/${{ matrix.image }}/Dockerfile
-          build-args: BUILD_ENV=${{ inputs.env }}
+          build-args: | 
+            BUILD_ENV=${{ inputs.env }}
+            FONTS_PASS=${{ secrets.FONTS_PASS }}
           push: true
           tags: ${{ secrets.ECR_REGISTRY }}/streamtide-${{ inputs.env }}-${{ matrix.image }}:latest

.gitignore

@@ -8,6 +8,7 @@
 /resources/public/img/avatar/*
 !resources/public/img/avatar/profile_placeholder.svg
 /resources/public/contracts/build/
+/resources/public/fonts/Kitten*
 /node_modules/
 /.cpcache/
 /.shadow-cljs/

bb.edn

@@ -8,6 +8,10 @@
                     :task (do
                             (println "Watching SCSS under resources/scss")
                             (shell {:dir "resources/scss"} "npx sass --watch --no-source-map -s compressed main.scss:../public/css/main.css"))}
+         extract-fonts {:doc "Extract fonts"
+                        :task (do
+                              (println "Extracting fonts to resources/public/fonts/")
+                              (shell {:dir "resources"} (format "unzip -P %s fonts.zip -d public/fonts/" (first *command-line-args*))))}
          compile-contracts {:doc "Compile smart contracts"
                             :task (do
                                     (println "Compiling smart contracts")

docker-builds/ui/Dockerfile

@@ -2,6 +2,7 @@ FROM 487920318758.dkr.ecr.us-west-2.amazonaws.com/cljs-web3-ci:node-18.7.0 AS bu
 USER root
 
 ARG BUILD_ENV=qa
+ARG FONTS_PASS
 ENV BUILD_ENV=${BUILD_ENV}
 ENV STREAMTIDE_ENV=${BUILD_ENV}
 
@@ -10,6 +11,7 @@ COPY  . /build/
 WORKDIR /build
 
 RUN yarn install && \
+    bb extract-fonts ${FONTS_PASS} && \
     bb compile-css && \
     bb release-ui && \
     bb compile-contracts

resources/scss/vars.scss

@@ -1,30 +1,30 @@
 @font-face {
 	font-family: 'kitten_boldregular';
-	src: url('../fonts/kittenboldtrial-webfont.woff2') format('woff2'), url('../fonts/kittenboldtrial-webfont.woff') format('woff');
+	src: url('../fonts/Kitten-Bold.woff') format('woff');
 	font-weight: normal;
 	font-style: normal;
 }
 @font-face {
 	font-family: 'kitten_fatregular';
-	src: url('../fonts/kittenfattrial-webfont.woff2') format('woff2'), url('../fonts/kittenfattrial-webfont.woff') format('woff');
+	src: url('../fonts/Kitten-Fat.woff') format('woff');
 	font-weight: normal;
 	font-style: normal;
 }
 @font-face {
 	font-family: 'kitten_slantregular';
-	src: url('../fonts/kittenslanttrial-webfont.woff2') format('woff2'), url('../fonts/kittenslanttrial-webfont.woff') format('woff');
+	src: url('../fonts/Kitten-Slant.woff') format('woff');
 	font-weight: normal;
 	font-style: normal;
 }
 @font-face {
 	font-family: 'kitten_swash_monolineregular';
-	src: url('../fonts/kittenswashmonolinetrial-webfont.woff2') format('woff2'), url('../fonts/kittenswashmonolinetrial-webfont.woff') format('woff');
+	src: url('../fonts/Kitten-Swash-Monoline.woff') format('woff');
 	font-weight: normal;
 	font-style: normal;
 }
 @font-face {
 	font-family: 'kitten_swashregular';
-	src: url('../fonts/kittenswashtrial-webfont.woff2') format('woff2'), url('../fonts/kittenswashtrial-webfont.woff') format('woff');
+	src: url('../fonts/Kitten-Swash.woff') format('woff');
 	font-weight: normal;
 	font-style: normal;
 }