Merge branch 'develop' into fb-leap-147/outliner-ff

HumanSignal · Jun 24, 2024 · c0e2c19 · c0e2c19
2 parents 9d98eb0 + e60e40b
commit c0e2c19
Show file tree

Hide file tree

Showing 202 changed files with 2,140 additions and 1,492 deletions.
diff --git a/.github/workflows/docker-build-ontop.yml b/.github/workflows/docker-build-ontop.yml
@@ -91,7 +91,7 @@ jobs:
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - name: Push Docker image
-        uses: docker/build-push-action@v5.4.0
+        uses: docker/build-push-action@v6.1.0
         id: docker_build_and_push
         with:
           context: .

diff --git a/.github/workflows/docker-build-ubi.yml b/.github/workflows/docker-build-ubi.yml
@@ -150,7 +150,7 @@ jobs:
             core.setOutput("ubi-tags", ubiTags.join(','));
 
       - name: Build and push ubi
-        uses: docker/build-push-action@v5.4.0
+        uses: docker/build-push-action@v6.1.0
         id: docker_build_and_push_ubi
         with:
           context: .

diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml
@@ -112,7 +112,7 @@ jobs:
           fi
 
       - name: Push Docker image
-        uses: docker/build-push-action@v5.4.0
+        uses: docker/build-push-action@v6.1.0
         id: docker_build_and_push
         with:
           context: .

diff --git a/.github/workflows/docker-release-promote.yml b/.github/workflows/docker-release-promote.yml
@@ -208,7 +208,7 @@ jobs:
           EOF
 
       - name: Build and Push Release Ubuntu Docker image
-        uses: docker/build-push-action@v5.4.0
+        uses: docker/build-push-action@v6.1.0
         id: docker_build
         with:
           context: ${{ steps.release_dockerfile.outputs.release_dir }}

diff --git a/label_studio/core/static/css/error.css b/label_studio/core/static/css/error.css
@@ -43,7 +43,7 @@
 
 /* Styles for dedicated error page */
 body > .ls-global-error {
-  font: 16px Roboto;
+  font-size: 16px;
   max-width: 600px;
   margin: 0 auto;
 }

diff --git a/label_studio/core/static/css/fonts.hellix.css b/label_studio/core/static/css/fonts.hellix.css
@@ -0,0 +1,15 @@
+@font-face {
+  font-family: "Hellix";
+  src: url("/static/fonts/Hellix-Regular.woff") format("woff");
+  font-weight: normal;
+  font-style: normal;
+  font-display: swap;
+}
+
+@font-face {
+  font-family: "Hellix";
+  src: url("/static/fonts/Hellix-SemiBold.woff") format("woff");
+  font-weight: 500;
+  font-style: normal;
+  font-display: swap;
+}