Merge branch 'main' into DALA-5335_Reassign-Uploader

d-fine · Feb 11, 2025 · e2adb91 · e2adb91
2 parents 528ff5c + 15cdf13
commit e2adb91
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/dataland-frontend/public/static/logos/img_ikb.png b/dataland-frontend/public/static/logos/img_ikb.png
diff --git a/dataland-frontend/src/assets/content.json b/dataland-frontend/src/assets/content.json
@@ -112,6 +112,7 @@
             "/static/logos/img_Experience_One.png",
             "/static/logos/img_fmf.png",
             "/static/logos/img_HansaInvest.png",
+            "/static/logos/img_ikb.png",
             "/static/logos/img_impact_cubed.png",
             "/static/logos/img_laiqon.png",
             "/static/logos/img_leonardo.png",

diff --git a/dataland-frontend/src/components/resources/newLandingPage/TheBrands.vue b/dataland-frontend/src/components/resources/newLandingPage/TheBrands.vue
@@ -26,7 +26,7 @@ const brandsSection = computed(() => {
 </script>
 
 <style scoped lang="scss">
-@use '@/assets/scss/newVariables' as *;
+@use '@/assets/scss/newVariables';
 
 .brands {
   display: flex;
@@ -83,7 +83,7 @@ const brandsSection = computed(() => {
   }
 }
 
-@media only screen and (max-width: $large) {
+@media only screen and (max-width: newVariables.$large) {
   .brands {
     &__wrap {
       grid-template-columns: repeat(12, 1fr);
@@ -101,7 +101,7 @@ const brandsSection = computed(() => {
     }
   }
 }
-@media only screen and (max-width: $medium) {
+@media only screen and (max-width: newVariables.$medium) {
   .brands {
     padding: 32px 0 80px;
     gap: 24px;
@@ -130,7 +130,7 @@ const brandsSection = computed(() => {
   }
 }
 
-@media only screen and (max-width: $small) {
+@media only screen and (max-width: newVariables.$small) {
   .brands {
     &__wrap {
       gap: 24px 16px;

diff --git a/dataland-frontend/tests/component/components/pages/LandingPage.cy.ts b/dataland-frontend/tests/component/components/pages/LandingPage.cy.ts
@@ -61,7 +61,7 @@ function validateIntroSection(): void {
  */
 function validateBrandsSection(): void {
   const images = getLandingPageSection('Brands').image;
-  expect(images?.length).to.eq(23);
+  expect(images?.length).to.eq(24);
   images!.forEach((image, index) => {
     const filename = image.split('/').slice(-1)[0];
     checkImage(`Brand ${index + 1}`, filename);