floating-images-design-updates: pulling in font updates and fixing me…

…rge conflicts.
hlxsites · Apr 3, 2024 · 475748a · 475748a
2 parents 8cac776 + d9c9bce
commit 475748a
Show file tree

Hide file tree

Showing 70 changed files with 226 additions and 189 deletions.
diff --git a/blocks/agent-search/agent-search.css b/blocks/agent-search/agent-search.css
@@ -88,7 +88,7 @@ main .section.agent-search-container {
 
 .agent-search.block .search-bar .suggester-results .list-title {
   padding: 15px 15px 5px;
-  font-family: var(--font-family-proxima);
+  font-family: var(--font-family-primary);
   font-size: var(--body-font-size-s);
   font-weight: var(--font-weight-bold);
   text-transform: uppercase;

diff --git a/blocks/blog-details/blog-details.css b/blocks/blog-details/blog-details.css
@@ -14,7 +14,7 @@
 }
 
 .blog-details.block .title {
-  font-family: var(--font-family-proxima);
+  font-family: var(--font-family-primary);
   font-weight: var(--font-weight-bold);
   font-size: var(--heading-font-size-m);
   line-height: var(--line-height-m);
@@ -237,7 +237,7 @@
 .blog-details.block .article-share-page h3 {
   padding-top: 32px;
   margin-bottom: 32px;
-  font-family: var(--font-family-proxima);
+  font-family: var(--font-family-primary);
   font-weight: var(--font-weight-bold);
 }
 

diff --git a/blocks/blog-listing/blog-listing.css b/blocks/blog-listing/blog-listing.css
@@ -36,7 +36,7 @@
 .blog-item .title {
   font-size: var(--body-font-size-l);
   margin-bottom: 16px;
-  font-family: var(--font-family-proxima);
+  font-family: var(--font-family-primary);
   font-weight: var(--font-weight-bold);
   letter-spacing: var(--letter-spacing-xs);
 }

diff --git a/blocks/blog-menu/blog-menu.css b/blocks/blog-menu/blog-menu.css
@@ -13,7 +13,7 @@
   background-color: var(--primary-color);
   color: var(--white);
   padding-top: 10px;
-  font-family: var(--font-family-proxima);
+  font-family: var(--font-family-primary);
   font-size: var(--body-font-size-m);
   width: 100vw;
   max-width: 1600px;
@@ -66,7 +66,7 @@
 .blog-nav a {
   text-decoration: none;
   letter-spacing: var(--letter-spacing-m);
-  font-family: var(--font-family-proxima);
+  font-family: var(--font-family-primary);
   font-size: var(--body-font-size-m);
   font-weight: var(--font-weight-normal);
   line-height: var(--line-height-m);
@@ -77,7 +77,7 @@
 .blog-nav h1 a {
   display: block;
   font-size: var(--heading-font-size-xl);
-  font-family: var(--font-family-proxima);
+  font-family: var(--font-family-primary);
   font-weight: var(--font-weight-bold);
   line-height: var(--line-height-m);
   text-align: center;
@@ -122,7 +122,7 @@
 }
 
 .blog-nav li {
-  font-family: var(--font-family-proxima);
+  font-family: var(--font-family-primary);
   font-size: var(--body-font-size-m);
   line-height: var(--line-height-m);
   letter-spacing: var(--letter-spacing-m);

diff --git a/blocks/cards/cards.css b/blocks/cards/cards.css
@@ -120,7 +120,7 @@
 
 .cards.block.icons .cards-list .cards-item .card-body h4 {
   text-transform: uppercase;
-  font-family: var(--font-family-proxima);
+  font-family: var(--font-family-primary);
   font-weight: var(--font-weight-semibold);
   letter-spacing: var(--letter-spacing-m);
   line-height: var(--line-height-m);

diff --git a/blocks/columns/luxury-collection-template.css b/blocks/columns/luxury-collection-template.css
@@ -3,16 +3,16 @@
 }
 
 .luxury-collection .columns.block h2 {
-    font-family: var(--font-family-gotham);
-    font-weight: var(--font-weight-light);
+    font-family: var(--font-family-luxury);
+    font-weight: var(--font-weight-normal);
     font-size:var(--heading-font-size-xxxxl);
     line-height: var(--line-height-xs);
     letter-spacing: 0;
     margin-bottom: 25px;
 }
 
 .luxury-collection .columns.block h3 {
-    font-family: var(--font-family-gotham);
+    font-family: var(--font-family-luxury);
     font-weight: var(--font-weight-bold);
     font-size: var(--body-font-size-m);
     line-height: var(--line-height-m);

diff --git a/blocks/floating-images/luxury-collection-template.css b/blocks/floating-images/luxury-collection-template.css
@@ -1,5 +1,5 @@
 .luxury-collection .heading h2 {
-    font-family: var(--font-family-gotham);
+    font-family: var(--font-family-luxury);
     font-weight: var(--font-weight-bold);
     font-size: var(--body-font-size-m);
     line-height: var(--line-height-m);
@@ -45,14 +45,14 @@
 }
 
 .luxury-collection .block.floating-images h2 {
-    font-family: var(--font-family-gotham);
+    font-family: var(--font-family-luxury);
     font-weight: 300;
     font-size:50px;
     line-height: 56px;
 }
 
 .luxury-collection .block.floating-images h3 {
-    font-family: var(--font-family-gotham);
+    font-family: var(--font-family-luxury);
     font-weight: 200;
     font-size: var(--heading-font-size-l);
     line-height: var(--line-height-s);
@@ -62,7 +62,7 @@
 }
 
 .luxury-collection .block.floating-images .content h4 {
-    font-family: var(--font-family-gotham);
+    font-family: var(--font-family-luxury);
     font-weight: var(--font-weight-normal);
     font-size: var(--body-font-size-m);
     line-height: var(--line-height-m);

diff --git a/blocks/footer/footer.css b/blocks/footer/footer.css
@@ -8,7 +8,7 @@ footer {
 .footer {
   padding-top: 35px;
   padding-bottom: 15px;
-  font-family: var(--font-family-proxima);
+  font-family: var(--font-family-primary);
   color: var(--body-color);
   line-height: var(--line-height-m);
 }

diff --git a/blocks/header/header.css b/blocks/header/header.css
@@ -94,7 +94,7 @@ body.light-nav {
 .header.block nav .nav-profile a {
   padding: 15px 0;
   color: var(--body-color);
-  font-family: var(--font-family-proxima);
+  font-family: var(--font-family-primary);
   font-weight: var(--font-weight-normal);
   font-size: var(--body-font-size-s);
   letter-spacing: var(--letter-spacing-reg);
@@ -198,7 +198,7 @@ body.light-nav {
 .header.block nav .nav-sections > ul > li > a {
   display: flex;
   padding: 15px 0;
-  font-family: var(--font-family-proxima);
+  font-family: var(--font-family-primary);
   font-weight: var(--font-weight-normal);
   font-size: var(--body-font-size-xl);
   line-height: var(--line-height-s);
@@ -216,7 +216,7 @@ body.light-nav {
 /* stylelint-disable-next-line no-descending-specificity */
 .header.block nav .nav-sections > ul > li > ul > li > a {
   display: block;
-  font-family: var(--font-family-proxima);
+  font-family: var(--font-family-primary);
   font-weight: var(--font-weight-normal);
   font-size: var(--body-font-size-m);
   line-height: var(--line-height-l);

diff --git a/blocks/hero/search/search.css b/blocks/hero/search/search.css
@@ -10,7 +10,7 @@
   padding: 5px 0;
   margin-bottom: 1.5em;
   flex: 1;
-  font-family: var(--font-family-proxima);
+  font-family: var(--font-family-primary);
   font-weight: 400;
   font-size: var(--body-font-size-m);
   text-align: center;
@@ -86,7 +86,7 @@
 
 .hero.block .content .search-bar .suggester-results .list-title {
   padding: 15px 15px 5px;
-  font-family: var(--font-family-proxima);
+  font-family: var(--font-family-primary);
   font-size: var(--body-font-size-s);
   font-weight: 700;
   text-transform: uppercase;

diff --git a/blocks/info-mouseover/info-mouseover.css b/blocks/info-mouseover/info-mouseover.css
@@ -12,7 +12,7 @@
   left: -180px;
   width: max-content;
   max-width: 200px;
-  font-family: var(--font-family-georgia);
+  font-family: var(--font-family-primary);
   font-weight: var(--font-weight-normal);
   font-size: var(--body-font-size-xs);
   line-height: var(--line-height-s);

diff --git a/blocks/juicer/juicer.css b/blocks/juicer/juicer.css
@@ -1,7 +1,7 @@
 .juicer.block h2 {
   padding: 1.5em 0;
   margin-bottom: 1.5em;
-  font-family: var(--font-family-proxima);
+  font-family: var(--font-family-primary);
   font-size: var(--heading-font-size-s);
   line-height: var(--line-height-s);
   letter-spacing: var(--letter-spacing-m);

diff --git a/blocks/liveby-demographics/liveby-demographics.css b/blocks/liveby-demographics/liveby-demographics.css
@@ -22,7 +22,7 @@
 .liveby-demographics.block > div .census-item span.census-value {
   margin-top: .6em;
   margin-bottom: .4em;
-  font-family: var(--font-family-proxima);
+  font-family: var(--font-family-primary);
   font-weight: var(--font-weight-semibold);
   font-size: var(--body-font-size-l);
   letter-spacing: normal;
@@ -31,7 +31,7 @@
 .liveby-demographics.block > div .census-item span.census-name {
   max-width: 9em;
   margin: 0 auto;
-  font-family: var(--font-family-proxima);
+  font-family: var(--font-family-primary);
   font-weight: var(--font-weight-normal);
   font-size: var(--body-font-size-s);
   letter-spacing: normal;

diff --git a/blocks/liveby-schools/liveby-schools.css b/blocks/liveby-schools/liveby-schools.css
@@ -14,7 +14,7 @@ main .section.liveby-schools-container p {
   margin: 8px 0;
   padding-left: 15px;
   padding-right: 15px;
-  font-family: var(--font-family-proxima);
+  font-family: var(--font-family-primary);
   font-size: var(--body-font-size-m);
   font-weight: var(--font-weight-normal);
   justify-content: flex-end;
@@ -24,7 +24,7 @@ main .section.liveby-schools-container p {
   appearance: none;
   padding: 8px 32px 8px 8px;
   color: var(--body-color);
-  font-family: var(--font-family-proxima);
+  font-family: var(--font-family-primary);
   font-size: var(--body-font-size-m);
   font-weight: var(--font-weight-normal);
   border-color: var(--grey);
@@ -59,7 +59,7 @@ main .section.liveby-schools-container p {
   margin-bottom: 1em;
   padding-top: 0;
   padding-bottom: .5em;
-  font-family: var(--font-family-georgia);
+  font-family: var(--font-family-primary);
   font-weight: var(--font-weight-bold);
   font-size: var(--heading-font-size-s);
   border-bottom: 1px solid var(--grey);
@@ -88,7 +88,7 @@ main .section.liveby-schools-container p {
 .liveby-schools .school-lists section .school-item .school-details .type {
   position: absolute;
   top: -.75em;
-  font-family: var(--font-family-proxima);
+  font-family: var(--font-family-primary);
   font-weight: var(--font-weight-normal);
   font-size: var(--body-font-size-xxs);
   text-transform: uppercase;
@@ -97,7 +97,7 @@ main .section.liveby-schools-container p {
 
 .liveby-schools .school-lists section .school-item .school-details h3 {
   margin: 0;
-  font-family: var(--font-family-georgia);
+  font-family: var(--font-family-primary);
   font-weight: var(--font-weight-bold);
   font-size: var(--heading-font-size-xs);
   line-height: var(--line-height-m);
@@ -139,7 +139,7 @@ main .section.liveby-schools-container p {
   max-width: 18%;
   margin-left: .5em;
   margin-top: .5em;
-  font-family: var(--font-family-proxima);
+  font-family: var(--font-family-primary);
   font-size: var(--body-font-size-xxs);
   text-align: center;
   line-height: var(--line-height-xl);

diff --git a/blocks/login/login.css b/blocks/login/login.css
@@ -43,7 +43,7 @@
   .login.block .login-form form h2 {
     margin-top: 30px;
     margin-bottom: 40px;
-    font-family: var(--font-family-georgia);
+    font-family: var(--font-family-primary);
     font-weight: var(--font-weight-bold);
     font-size: var(--heading-font-size-m);
     line-height: var(--line-height-m);
@@ -94,7 +94,7 @@
   }
 
   .login.block .login-form form .message span {
-    font-family: var(--font-family-proxima);
+    font-family: var(--font-family-primary);
     font-size: var(--body-font-size-xs);
     line-height: var(--line-height-s);
   }
@@ -105,7 +105,7 @@
     width: 100%;
     padding-left: 15px;
     margin-bottom: 1em;
-    font-family: var(--font-family-proxima);
+    font-family: var(--font-family-primary);
     font-size: var(--body-font-size-s);
     line-height: 50px;
     color: var(--body-color);

diff --git a/blocks/profile/profile.css b/blocks/profile/profile.css
@@ -6,7 +6,7 @@
 .profile h4 {
     line-height: var(--line-height-m);
     padding-bottom: 0.5em;
-    font-family: var(--font-family-georgia);
+    font-family: var(--font-family-primary);
 }
 
 .profile nav button {

diff --git a/blocks/property-listing/cards/cards.css b/blocks/property-listing/cards/cards.css
@@ -38,7 +38,7 @@
   text-transform: uppercase;
   color: var(--body-color);
   line-height: var(--line-height-xs);
-  font-family: var(--font-family-proxima);
+  font-family: var(--font-family-primary);
   font-weight: var(--font-weight-light);
   align-items: center;
   justify-content: center;
@@ -108,7 +108,7 @@
   font-size: var(--body-font-size-xs);
   padding: 0 7px;
   line-height: 24px;
-  font-family: var(--font-family-proxima);
+  font-family: var(--font-family-primary);
   font-weight: var(--font-weight-semibold);
   margin: 5px 0 5px 5px;
   align-items: center;
@@ -212,7 +212,7 @@
 }
 
 .property-list-cards .property-details .property-info-wrapper .address {
-  font-family: var(--font-family-proxima);
+  font-family: var(--font-family-primary);
   font-weight: var(--font-weight-normal);
   font-size: var(--body-font-size-s);
   color: var(--body-color);
@@ -223,7 +223,7 @@
 }
 
 .property-list-cards .property-details .property-info-wrapper .specs {
-  font-family: var(--font-family-proxima);
+  font-family: var(--font-family-primary);
   font-weight: var(--font-weight-light);
   color: var(--body-color);
   font-size: var(--body-font-size-xs);
@@ -296,7 +296,7 @@
 
 .property-list-cards .listing-tile .extra-info div {
   font-size: var(--body-font-size-xs);
-  font-family: var(--font-family-proxima);
+  font-family: var(--font-family-primary);
   color: var(--dark-grey);
   letter-spacing: 0;
   line-height: var(--line-height-xs);

diff --git a/blocks/property-listing/luxury-collection-template.css b/blocks/property-listing/luxury-collection-template.css
@@ -37,7 +37,7 @@
     font-weight: var(--font-weight-light);
     font-size: var(--heading-font-size-l);
     line-height: var(--line-height-s);
-    font-family: var(--font-family-gotham);
+    font-family: var(--font-family-luxury);
     letter-spacing: var(--letter-spacing-xs);
     border-bottom: 0;
     text-transform: none;