composer.json

@@ -208,9 +208,6 @@
             "drupal/ds": {
                 "Parent theme template inheritance bug": "https://www.drupal.org/files/issues/2021-02-22/2895316-12.patch"
             },
-            "drupal/fitvids": {
-                "Missing FitVids.js library causes error in file_get_contents": "https://www.drupal.org/files/issues/2025-06-27/fitvids-issue-3501317-comment-15991650-missing-fitbitjs-lib-patch-for-v210.patch"
-            },
             "drupal/unique_content_field_validation": {
                 "Overriden title field" : "https://www.drupal.org/files/issues/2023-01-05/unique-validation-title-override.patch"
             }

composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "be38033ac028629147a18715fe656601",
+    "content-hash": "90e491a31bd6246e3104f4f0898a743a",
     "packages": [
         {
             "name": "abraham/twitteroauth",
@@ -8614,7 +8614,7 @@
             "extra": {
                 "drupal": {
                     "version": "4.0.24",
-                    "datestamp": "1750262254",
+                    "datestamp": "1750261053",
                     "security-coverage": {
                         "status": "covered",
                         "message": "Covered by Drupal's security advisory policy"

config/sync/views.view.search.yml

@@ -98,7 +98,6 @@ display:
         type: full
         options:
           offset: 0
-          pagination_heading_level: h4
           items_per_page: 20
           total_pages: null
           id: 0
@@ -116,6 +115,7 @@ display:
             offset: false
             offset_label: Offset
           quantity: 9
+          pagination_heading_level: h4
       exposed_form:
         type: basic
         options:
@@ -225,10 +225,7 @@ display:
         - 'languages:language_interface'
         - url
         - url.query_args
-        - 'user.node_grants:view'
+      tags: {  }
-      tags:
-        - 'config:search_api.index.content'
-        - 'search_api_list:content'
   page_1:
     id: page_1
     display_title: Page
@@ -243,7 +240,6 @@ display:
         title: Search
         description: 'Search site content'
         weight: -41
-        enabled: false
         expanded: false
         menu_name: main
         parent: ''
@@ -255,7 +251,4 @@ display:
         - 'languages:language_interface'
         - url
         - url.query_args
-        - 'user.node_grants:view'
+      tags: {  }
-      tags:
-        - 'config:search_api.index.content'
-        - 'search_api_list:content'

web/themes/custom/geofresco/src/global/_components.scss

@@ -4,16 +4,18 @@
  * ../../node_modules/bulma/sass/components
  */
 
-@use "variables" as local;
+@use "variables" as *;
 @use "../../node_modules/bulma/sass/utilities/mixins" as *;
 @use "../../node_modules/bulma/sass/utilities/initial-variables" as *;
 
-// Make menu items slightly less far apart so we never entirely lose 'Community'
+/**
-// on mid-size screens.  See https://gitlab.com/drutopia/octavia/issues/52
+ * Make menu items slightly less far apart so we never entirely lose
+ * 'Community' on mid-size screens.
+ * See https://gitlab.com/drutopia/octavia/issues/52
+ */
 .navbar-item, .navbar-link {
   padding-left: .75rem;
   padding-right: .75rem;
-  padding-top: 1.5rem;
   @include from($widescreen) {
     padding-left: 1rem;
     padding-right: 1rem;
@@ -26,33 +28,21 @@
 }
 
 #navbar-menu {
-  a:hover {
-    background-color: local.$yellow !important;
-  }
   display: flex;
   // More modern Bulma has is-flex-wrap-wrap as a class for this.
   flex-wrap: wrap;
-  @include until($desktop) {
+  @include until($tablet) {
-    display: table;
+    width: 100%;
-    // width: 100%;
+    justify-content: space-around;
-    // justify-content: space-around;
-    // Do not show the down arrow when it is already expanded.
-    .navbar-link::after {
-      display: none !important;
-    }
   }
   @include from($desktop) {
     flex-wrap: nowrap;
     margin-right: -1rem;
-    // Stay open as long as we are hovering; Bulma should be handling this but :shrug:
-    .navbar-dropdown:hover {
-      display: block;
-    }
   }
 }
 
 
-// Featured images on article pages.
+/* Featured images on article pages */
 .featured-image figure.image {
   width: 100vw;
   position: relative;
@@ -141,7 +131,7 @@
  */
 .footer .views-field {
   .field-content {
-    background-color: rgba(local.$offwhite, 0.9);
+    background-color: rgba($offwhite, 0.9);
     padding: 0.2em;
     border-radius: 0.3em;
   }
@@ -157,14 +147,14 @@
 }
 
 .page-title .title > span {
-  background-color: rgba(local.$offwhite, 0.66);
+  background-color: rgba($offwhite, 0.66);
   padding: 0.4em 0.3em 0.3em 0.3em;
   border-radius: 0.4em;
   line-height: 1.8;
 }
 
 .block--footer_menus {
-  background-color: rgba(local.$offwhite, 0.9);
+  background-color: rgba($offwhite, 0.9);
   padding: 0.2em;
   border-radius: 0.3em;
 }

web/themes/custom/geofresco/src/global/_content.scss

@@ -1,4 +1,7 @@
-// Styles for contributor-added content on the site, such as embedded media.
+/**
+ * Styles related to contributor-added content on the site, such as embedded
+ * media.
+ */
 
 iframe {
   width: 100%;
@@ -7,8 +10,3 @@ iframe {
     height: revert-layer;
   }
 }
-
-// Header tabs section is only shown to content editors for the Edit etc tabs.
-.header-tabs {
-  padding: 0;
-}

web/themes/custom/geofresco/src/global/_elements.scss

@@ -26,15 +26,11 @@
 
 .geo-logo-name {
   display: flex !important;
-  padding-bottom: 0 !important; // Or else .column's padding takes precedence.
   overflow: hidden;
   width: 100%;
   .logo, .sitename {
     display: table-cell;
   }
-  .sitename {
-    padding-top: 0.125rem; // 2px, better vertically-center "Organizing" in green stripe
-  }
   .logo a {
     display: block;
   }
@@ -56,7 +52,6 @@
 
 .slogan {
   box-shadow: 0 2px 0 0 whitesmoke;
-  margin-top: -1rem;
   margin-bottom: 2px; // Needed to see the boxshadow when we have the featured image directly below.
   padding-bottom: 4px; // Give just a little extra space at the bottom for the *appearance* of balance.
   .title {

web/themes/custom/geofresco/src/global/_layout.scss

@@ -5,25 +5,12 @@
 @use "../../node_modules/bulma/sass/utilities/mixins";
 @use "../../node_modules/bulma/sass/utilities/initial-variables" as *;
 
-// Allow sitename to slide over the logo on tiny screens.
+// Center logo & sitename when they stack on tiny screens.
 @include mixins.until(local.$mini) {
-  .geo-logo-name .sitename {
+  .sitename.column,
-    position: absolute;
+  .logo.column {
-    left: calc(100vw - 14rem);
+    width: 100%;
-    top: 0;
   }
-  // .logo.column {
-  //   width: 100%;
-  // }
-  .navigation.column .hamburger {
-    position: absolute;
-    right: 0;
-    top: 0;
-  }
-}
-
-.search-bar {
-  padding-top: 1.75rem;
 }
 
 .search-bar > .block,

web/themes/custom/geofresco/src/global/_paint.scss

@@ -63,14 +63,3 @@
 .page--content-item--gleaning .page-title {
   background-color: $gleaning;
 }
-
-:root {
-  --bulma-body-color: $geo-green;
-  --bulma-navbar-dropdown-background-color: white;
-  --bulma-navbar-dropdown-z: 999;
-}
-// Not figuring out the damn -l -h -s to make our primary color.
-.button.is-primary {
-  background-color: $geo-green;
-  color: white;
-}

web/themes/custom/geofresco/src/global/_variables.scss

@@ -22,7 +22,7 @@ $gleaning: $yellow;
 // Update Bulma's global variables.
 $primary: $geo-green;
 
-$mini: 448px;
+$mini: 363px;
 
 // Font family
 $family-geo: "Ocan", "Ubuntu", "Arial Narrow", "Helvetica", "Arial", "Lucida", sans-serif !default;

web/themes/custom/geofresco/src/global/global.scss

@@ -6,8 +6,6 @@
 
 @forward "../../node_modules/bulma/sass/utilities" with (
   $background: white,
-  $green: $geo-green,
-  $blue: $blue,
 );
 @forward "fonts";
 @forward "../../node_modules/bulma/sass/base/_index";
@@ -16,27 +14,19 @@
 @forward "elements";
 @forward "../../node_modules/bulma/sass/form/_index";
 @forward "form";
-// $navbar-breakpoint: calc($mini/2);
+$navbar-breakpoint: calc($mini/2);
-@forward "../../node_modules/bulma/sass/components/_index" with (
+@forward "../../node_modules/bulma/sass/components/_index";
-  $navbar-dropdown-background-color: white,
-);
 @forward "components";
 @forward "../../node_modules/bulma/sass/grid/_index";
 @forward "grid";
 @forward "../../node_modules/bulma/sass/layout/_index";
 @forward "layout";
 
+// Import the themes so that all CSS variables have a value
+@forward "../../node_modules/bulma/sass/themes";
+
 // Stylesheets below will have access to all Bulma variables and mixins.
 @forward "content";
 @forward "paint";
 
-// Import the themes so that all CSS variables have a value (not) but avoid dark mode.
-@use "../../node_modules/bulma/sass/themes/light";
-@use "../../node_modules/bulma/sass/themes/setup";
-
-:root {
-  @include light.light-theme;
-  @include setup.setup-theme;
-}
-
 // @forward '../../node_modules/bulma-extensions/bulma-timeline/dist/bulma-timeline';

web/themes/custom/geofresco/src/templates/block/block--system-branding-block.html.twig

@@ -14,7 +14,7 @@
  * @ingroup themeable
  */
 #}
-<div class="column is-narrow geo-logo-name">
+<div class="column is-narrow geo-logo-name is-paddingless">
 {% if site_logo %}
 <div class="logo">
   <a href="{{ path('<front>') }}" title="{{ 'Home'|t }}" rel="home">

web/themes/custom/geofresco/src/templates/elements/menu--nav-bulma.html.twig

@@ -57,6 +57,9 @@
             ])
           %}
         {% endif %}
+        {% if item.url|render == '/search' %}
+          {% set item_classes = item_classes|merge(['is-hidden-desktop search-icon']) %}
+        {% endif %}
       {% endif %}
       {{ link(
         item.title,

web/themes/custom/geofresco/src/templates/layout/page.html.twig

@@ -19,7 +19,7 @@
 {# We put everything in Bulma columns so must do navbar in header block, not here #}
 {% endblock navbar %}
 {% block header %}
-<div class="header columns is-mobile is-marginless">
+<div class="header columns is-marginless">
   {% block navbar_branding %}
   {{ page.navbar_branding }}
   {% endblock navbar_branding %}

web/themes/custom/geofresco/src/templates/layout/region--header-tabs.html.twig

@@ -13,7 +13,8 @@
  */
 #}
 {% if content %}
-  <section{{ attributes.addClass(['section', 'header-tabs']) }}>
+  {% set attributes = attributes.addClass(['section, is-paddingless']) %}
+  <section{{ attributes }}>
     <div class="container">
       {{ content }}
     </div>