Merge pull request #6345 from OCHA-DAP/dev

dev into prod for landing pages
OCHA-DAP · Jun 6, 2024 · a91e364 · a91e364
2 parents 78180e9 + e53830b
commit a91e364
Show file tree

Hide file tree

Showing 26 changed files with 348 additions and 93 deletions.
diff --git a/ckanext-hdx_theme/ckanext/hdx_theme/fanstatic/base/components/hdx-logo.css b/ckanext-hdx_theme/ckanext/hdx_theme/fanstatic/base/components/hdx-logo.css
@@ -19,7 +19,7 @@
   background-repeat: no-repeat;
   background-position: left center;
   width: 126px;
-  height: 30px;
-  margin-top: 1px;
+  height: 28px;
+  margin-top: 3px;
 }
 /* END HDX Version display */
diff --git a/ckanext-hdx_theme/ckanext/hdx_theme/fanstatic/base/header.css b/ckanext-hdx_theme/ckanext/hdx_theme/fanstatic/base/header.css
@@ -4180,8 +4180,8 @@ ul.list-horizontal li:first-child:before {
   background-repeat: no-repeat;
   background-position: left center;
   width: 126px;
-  height: 30px;
-  margin-top: 1px;
+  height: 28px;
+  margin-top: 3px;
 }
 /* END HDX Version display */
 /* HEADER Search Widget  */

diff --git a/ckanext-hdx_theme/ckanext/hdx_theme/fanstatic/bem.blocks/hero.css b/ckanext-hdx_theme/ckanext/hdx_theme/fanstatic/bem.blocks/hero.css
@@ -4,7 +4,7 @@
 .bem-hero__title {
   color: #000;
   font-weight: 400;
-  font-family: 'Gotham-Bold', sans-serif;
+  font-family: 'Gotham-Book', sans-serif;
   font-size: 48px;
   line-height: 48px;
 }
@@ -40,7 +40,7 @@
   line-height: 28px;
 }
 .bem-hero__image {
-  max-height: 50px;
+  max-height: 45px;
 }
 .bem-hero__sections {
   color: #000;

diff --git a/ckanext-hdx_theme/ckanext/hdx_theme/fanstatic/bem.blocks/table.css b/ckanext-hdx_theme/ckanext/hdx_theme/fanstatic/bem.blocks/table.css
@@ -0,0 +1,58 @@
+.bem-table__thead {
+  font-weight: 600;
+  font-size: 18px;
+  line-height: 24px;
+  color: #000;
+}
+.bem-table__tbody {
+  font-size: 18px;
+  line-height: 24px;
+  color: #000;
+}
+.bem-table__cell a {
+  font-family: 'Inter', sans-serif;
+  font-size: 16px;
+  font-weight: 600;
+  color: #007CE1;
+}
+.bem-table_state_bordered {
+  border: 1px solid #E1E4ED;
+  border-radius: 8px;
+  box-shadow: 0 1px 4px 0 #D1D5DB;
+}
+@media (max-width: 768px) {
+  .bem-table_state_bordered {
+    border: 0;
+    border-radius: 0;
+    box-shadow: unset;
+  }
+}
+.bem-table_state_bordered .bem-table__thead .bem-table__row .row > *,
+.bem-table_state_bordered .bem-table__tbody .bem-table__row .row > * {
+  border-bottom: 1px solid #E1E4ED;
+  border-right: 1px solid #E1E4ED;
+}
+.bem-table_state_bordered .bem-table__thead .bem-table__row .row > *:last-child,
+.bem-table_state_bordered .bem-table__tbody .bem-table__row .row > *:last-child {
+  border-right: 0;
+}
+@media (max-width: 768px) {
+  .bem-table_state_bordered .bem-table__thead .bem-table__row .row > *,
+  .bem-table_state_bordered .bem-table__tbody .bem-table__row .row > * {
+    border-bottom: 0;
+    border-right: 0;
+  }
+}
+@media (max-width: 768px) {
+  .bem-table_state_bordered .bem-table__thead .bem-table__row,
+  .bem-table_state_bordered .bem-table__tbody .bem-table__row {
+    border: 1px solid #E1E4ED;
+    border-radius: 8px;
+    box-shadow: 0 1px 4px 0 #D1D5DB;
+    padding: 28px 32px;
+  }
+}
+.bem-table_state_bordered .bem-table__thead.bem-table__tbody .bem-table__row:last-child .row > *,
+.bem-table_state_bordered .bem-table__tbody.bem-table__tbody .bem-table__row:last-child .row > * {
+  border-bottom: 0;
+}
diff --git a/ckanext-hdx_theme/ckanext/hdx_theme/fanstatic/css/empty.css b/ckanext-hdx_theme/ckanext/hdx_theme/fanstatic/css/empty.css
diff --git a/ckanext-hdx_theme/ckanext/hdx_theme/fanstatic/light/page-extra-light.css b/ckanext-hdx_theme/ckanext/hdx_theme/fanstatic/light/page-extra-light.css
@@ -1637,8 +1637,8 @@ hr.dotted {
   background-repeat: no-repeat;
   background-position: left center;
   width: 126px;
-  height: 30px;
-  margin-top: 1px;
+  height: 28px;
+  margin-top: 3px;
 }
 /* END HDX Version display */
 /* Style breadcrumbs */

diff --git a/ckanext-hdx_theme/ckanext/hdx_theme/fanstatic/light/page-light.css b/ckanext-hdx_theme/ckanext/hdx_theme/fanstatic/light/page-light.css
@@ -4212,8 +4212,8 @@ ul.list-horizontal li:first-child:before {
   background-repeat: no-repeat;
   background-position: left center;
   width: 126px;
-  height: 30px;
-  margin-top: 1px;
+  height: 28px;
+  margin-top: 3px;
 }
 /* END HDX Version display */
 /* HEADER Search Widget  */

diff --git a/ckanext-hdx_theme/ckanext/hdx_theme/fanstatic/organization_/base/organization.css b/ckanext-hdx_theme/ckanext/hdx_theme/fanstatic/organization_/base/organization.css
@@ -4307,8 +4307,8 @@ ul.list-horizontal li:first-child:before {
   background-repeat: no-repeat;
   background-position: left center;
   width: 126px;
-  height: 30px;
-  margin-top: 1px;
+  height: 28px;
+  margin-top: 3px;
 }
 /* END HDX Version display */
 /* HEADER Search Widget  */

diff --git a/ckanext-hdx_theme/ckanext/hdx_theme/fanstatic/webassets.yml b/ckanext-hdx_theme/ckanext/hdx_theme/fanstatic/webassets.yml
@@ -142,6 +142,7 @@ bem-blocks-styles:
     - bem.blocks/form_button.css
     - bem.blocks/account_options.css
     - bem.blocks/info_box.css
+    - bem.blocks/table.css
     - bem.blocks/select2_field.css
     - bem.blocks/textarea_field.css
 
@@ -347,11 +348,15 @@ onboarding-bulk-user-styles:
       - hdx_theme/onboarding-done-styles
       - hdx_theme/onboarding-select-org-styles
       - hdx_theme/onboarding-survey-styles
+  contents:
+    - css/empty.css
 
 onboarding-bulk-user-scripts:
   extra:
     preload:
       - hdx_theme/onboarding-scripts
+  contents:
+    - css/empty.css
 
 onboarding-bulk-user-complete-onboarding-scripts:
   extra:
@@ -360,19 +365,26 @@ onboarding-bulk-user-complete-onboarding-scripts:
       - hdx_theme/onboarding-follow-scripts
       - hdx_theme/onboarding-invite-scripts
       - hdx_theme/onboarding-select-org-scripts
+  contents:
+    - css/empty.css
 
 onboarding-bulk-anon-styles:
   extra:
     preload:
       - hdx_theme/onboarding-styles
       - hdx_theme/onboarding-verify-styles
       - hdx_theme/onboarding-survey-styles
+  contents:
+    - css/empty.css
+
 
 onboarding-bulk-anon-scripts:
   extra:
     preload:
       - hdx_theme/onboarding-scripts
       - hdx_theme/onboarding-password-scripts
+  contents:
+    - css/empty.css
 
 onboarding-verify-styles:
   output: ckanext-hdx_theme/%(version)s_onboarding-verify-styles.css
@@ -664,6 +676,8 @@ dataset-read-styles:
       - hdx_theme/group-message-styles
       - requestdata/main-styles
       - hdx_theme/resource-list-styles
+  contents:
+    - css/empty.css
 
 dataset-light-scripts:
   <<: *common-js
@@ -1006,6 +1020,8 @@ country-topline-scripts:
       - hdx_theme/country-scripts
       - hdx_theme/charting-scripts
       # this should not load here - hdx_theme/homepage-scripts
+  contents:
+    - css/empty.css
 
 country-topline-styles:
   output: ckanext-hdx_theme/%(version)s_country-topline-styles.css
@@ -1084,6 +1100,8 @@ group-form-scripts:
     preload:
       - hdx_theme/ckan
       - hdx_theme/organization-form-styles
+  contents:
+    - css/empty.css
 
 group-list-scripts:
   <<: *common-js
@@ -1338,6 +1356,8 @@ group-message-styles:
 
 dataviz-scripts:
   output: ckanext-hdx_theme/%(version)s_dataviz-scripts.js
+  contents:
+    - css/empty.css
 
 dataviz-styles:
   output: ckanext-hdx_theme/%(version)s_dataviz-styles.css

diff --git a/.../ckanext/hdx_theme/hdx-styles/src/common/images/landing_pages/logo_hdx_hapi.png b/.../ckanext/hdx_theme/hdx-styles/src/common/images/landing_pages/logo_hdx_hapi.png
diff --git a/...anext/hdx_theme/hdx-styles/src/common/images/landing_pages/logo_hdx_signals.png b/...anext/hdx_theme/hdx-styles/src/common/images/landing_pages/logo_hdx_signals.png
diff --git a/...ckanext/hdx_theme/hdx-styles/src/common/images/landing_pages/partners/fsnwg.png b/...ckanext/hdx_theme/hdx-styles/src/common/images/landing_pages/partners/fsnwg.png
diff --git a/...e/ckanext/hdx_theme/hdx-styles/src/common/images/landing_pages/partners/fts.png b/...e/ckanext/hdx_theme/hdx-styles/src/common/images/landing_pages/partners/fts.png
diff --git a/ckanext-hdx_theme/ckanext/hdx_theme/hdx-styles/src/common/less/base/components/hdx-logo.less b/ckanext-hdx_theme/ckanext/hdx_theme/hdx-styles/src/common/less/base/components/hdx-logo.less
@@ -24,8 +24,8 @@
       background-repeat: no-repeat;
       background-position: left center;
       width: 126px;
-      height: 30px;
-      margin-top: 1px;
+      height: 28px;
+      margin-top: 3px;
     }
   }
 }

diff --git a/ckanext-hdx_theme/ckanext/hdx_theme/hdx-styles/src/common/less/bem.blocks/hero.less b/ckanext-hdx_theme/ckanext/hdx_theme/hdx-styles/src/common/less/bem.blocks/hero.less
@@ -6,7 +6,7 @@
   &__title {
     color: @black-color;
     font-weight: 400;
-    font-family: 'Gotham-Bold', sans-serif;
+    font-family: 'Gotham-Book', sans-serif;
     font-size: 48px;
     line-height: 48px;
     @media (max-width: @breakpoint-lg) {
@@ -43,7 +43,7 @@
   }
 
   &__image {
-    max-height: 50px;
+    max-height: 45px;
   }
 
   &__sections {

diff --git a/ckanext-hdx_theme/ckanext/hdx_theme/hdx-styles/src/common/less/bem.blocks/table.less b/ckanext-hdx_theme/ckanext/hdx_theme/hdx-styles/src/common/less/bem.blocks/table.less
@@ -0,0 +1,80 @@
+@import "bem_variables";
+
+.bem-table {
+
+  &__thead {
+    font-weight: 600;
+    font-size: 18px;
+    line-height: 24px;
+    color: @black-color;
+  }
+
+  &__tbody {
+    font-size: 18px;
+    line-height: 24px;
+    color: @black-color;
+  }
+
+  &__cell {
+
+    a {
+      font-family: 'Inter', sans-serif;
+      font-size: 16px;
+      font-weight: 600;
+      color: @blue-light-color;
+    }
+  }
+
+  &_state_bordered {
+    border: 1px solid @grey-extra-light-color;
+    border-radius: 8px;
+    box-shadow: 0 1px 4px 0 @grey-light-color;
+
+    @media (max-width: @breakpoint-md) {
+      border: 0;
+      border-radius: 0;
+      box-shadow: unset;
+    }
+
+    .bem-table__thead,
+    .bem-table__tbody {
+      .bem-table__row {
+        .row {
+          > * {
+            border-bottom: 1px solid @grey-extra-light-color;
+            border-right: 1px solid @grey-extra-light-color;
+
+            &:last-child {
+              border-right: 0;
+            }
+
+            @media (max-width: @breakpoint-md) {
+              border-bottom: 0;
+              border-right: 0;
+            }
+
+          }
+        }
+
+        @media (max-width: @breakpoint-md) {
+          border: 1px solid @grey-extra-light-color;
+          border-radius: 8px;
+          box-shadow: 0 1px 4px 0 @grey-light-color;
+          padding: 28px 32px;
+        }
+      }
+
+      &.bem-table__tbody {
+        .bem-table__row {
+          &:last-child {
+            .row {
+              > * {
+                border-bottom: 0;
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}