From 692f8f6fd7eb5cee2d1e3941ce206a1ce8ef38c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?benjamin=20melan=C3=A7on?= Date: Sat, 19 Jul 2025 22:06:08 -0400 Subject: [PATCH 01/10] Apply self-updates to search view caused by saving it --- config/sync/views.view.search.yml | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/config/sync/views.view.search.yml b/config/sync/views.view.search.yml index 84aa598..fc61485 100644 --- a/config/sync/views.view.search.yml +++ b/config/sync/views.view.search.yml @@ -98,6 +98,7 @@ display: type: full options: offset: 0 + pagination_heading_level: h4 items_per_page: 20 total_pages: null id: 0 @@ -115,7 +116,6 @@ display: offset: false offset_label: Offset quantity: 9 - pagination_heading_level: h4 exposed_form: type: basic options: @@ -225,7 +225,10 @@ display: - 'languages:language_interface' - url - url.query_args - tags: { } + - 'user.node_grants:view' + tags: + - 'config:search_api.index.content' + - 'search_api_list:content' page_1: id: page_1 display_title: Page @@ -251,4 +254,7 @@ display: - 'languages:language_interface' - url - url.query_args - tags: { } + - 'user.node_grants:view' + tags: + - 'config:search_api.index.content' + - 'search_api_list:content' From 018dd5a6a67c3e23eeb6f1fa10a41fdf1e41353a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?benjamin=20melan=C3=A7on?= Date: Sat, 19 Jul 2025 22:07:09 -0400 Subject: [PATCH 02/10] Disable search menu item we have an actual search bar --- config/sync/views.view.search.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/config/sync/views.view.search.yml b/config/sync/views.view.search.yml index fc61485..1d8f6b8 100644 --- a/config/sync/views.view.search.yml +++ b/config/sync/views.view.search.yml @@ -243,6 +243,7 @@ display: title: Search description: 'Search site content' weight: -41 + enabled: false expanded: false menu_name: main parent: '' From bcb559caa6526502d04709f29847eb8b72d34a6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?benjamin=20melan=C3=A7on?= Date: Sat, 19 Jul 2025 22:08:36 -0400 Subject: [PATCH 03/10] Redeifine mini size for when we let sitename slide over the logo #114 --- .../custom/geofresco/src/global/_layout.scss | 15 ++++++++++++--- .../custom/geofresco/src/global/_variables.scss | 2 +- .../custom/geofresco/src/global/global.scss | 2 +- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/web/themes/custom/geofresco/src/global/_layout.scss b/web/themes/custom/geofresco/src/global/_layout.scss index ea47f4e..938ca4b 100644 --- a/web/themes/custom/geofresco/src/global/_layout.scss +++ b/web/themes/custom/geofresco/src/global/_layout.scss @@ -7,9 +7,18 @@ // Center logo & sitename when they stack on tiny screens. @include mixins.until(local.$mini) { - .sitename.column, - .logo.column { - width: 100%; + .geo-logo-name .sitename { + position: absolute; + left: calc(100vw - 14rem); + top: 0.5rem; + } + // .logo.column { + // width: 100%; + // } + .navigation.column .hamburger { + position: absolute; + right: 0; + top: 0.5rem; } } diff --git a/web/themes/custom/geofresco/src/global/_variables.scss b/web/themes/custom/geofresco/src/global/_variables.scss index dd9adc1..6b0c2a9 100644 --- a/web/themes/custom/geofresco/src/global/_variables.scss +++ b/web/themes/custom/geofresco/src/global/_variables.scss @@ -22,7 +22,7 @@ $gleaning: $yellow; // Update Bulma's global variables. $primary: $geo-green; -$mini: 363px; +$mini: 448px; // Font family $family-geo: "Ocan", "Ubuntu", "Arial Narrow", "Helvetica", "Arial", "Lucida", sans-serif !default; diff --git a/web/themes/custom/geofresco/src/global/global.scss b/web/themes/custom/geofresco/src/global/global.scss index e978eb1..a762629 100644 --- a/web/themes/custom/geofresco/src/global/global.scss +++ b/web/themes/custom/geofresco/src/global/global.scss @@ -14,7 +14,7 @@ @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"; @forward "components"; @forward "../../node_modules/bulma/sass/grid/_index"; From f0a7c06342be98d61d66a900f51691086c98f93d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?benjamin=20melan=C3=A7on?= Date: Sat, 19 Jul 2025 22:09:22 -0400 Subject: [PATCH 04/10] Remove special search menu item handling we have a search bar Either in the menu, or in the hamburger drawer Ref #114 --- .../geofresco/src/templates/elements/menu--nav-bulma.html.twig | 3 --- 1 file changed, 3 deletions(-) diff --git a/web/themes/custom/geofresco/src/templates/elements/menu--nav-bulma.html.twig b/web/themes/custom/geofresco/src/templates/elements/menu--nav-bulma.html.twig index ffc614c..9717108 100644 --- a/web/themes/custom/geofresco/src/templates/elements/menu--nav-bulma.html.twig +++ b/web/themes/custom/geofresco/src/templates/elements/menu--nav-bulma.html.twig @@ -57,9 +57,6 @@ ]) %} {% endif %} - {% if item.url|render == '/search' %} - {% set item_classes = item_classes|merge(['is-hidden-desktop search-icon']) %} - {% endif %} {% endif %} {{ link( item.title, From fe6b0af8e11d30a7b73e5c364e26432d4ece22bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?benjamin=20melan=C3=A7on?= Date: Sat, 19 Jul 2025 22:10:11 -0400 Subject: [PATCH 05/10] Keep columns even on mobile size #114 --- web/themes/custom/geofresco/src/templates/layout/page.html.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/themes/custom/geofresco/src/templates/layout/page.html.twig b/web/themes/custom/geofresco/src/templates/layout/page.html.twig index 8633cec..a418e45 100644 --- a/web/themes/custom/geofresco/src/templates/layout/page.html.twig +++ b/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 %} -
+
{% block navbar_branding %} {{ page.navbar_branding }} {% endblock navbar_branding %} From cdcaf717afa7565a9191071024ee58a86a0ab122 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?benjamin=20melan=C3=A7on?= Date: Mon, 21 Jul 2025 01:07:55 -0400 Subject: [PATCH 06/10] Make everything good (enough) #114 #126 --- .../geofresco/src/global/_components.scss | 36 ++++++++++++------- .../custom/geofresco/src/global/_content.scss | 10 +++--- .../geofresco/src/global/_elements.scss | 5 +++ .../custom/geofresco/src/global/_layout.scss | 10 ++++-- .../custom/geofresco/src/global/_paint.scss | 11 ++++++ .../custom/geofresco/src/global/global.scss | 18 +++++++--- 6 files changed, 66 insertions(+), 24 deletions(-) diff --git a/web/themes/custom/geofresco/src/global/_components.scss b/web/themes/custom/geofresco/src/global/_components.scss index c0b488e..e2c1209 100644 --- a/web/themes/custom/geofresco/src/global/_components.scss +++ b/web/themes/custom/geofresco/src/global/_components.scss @@ -4,18 +4,16 @@ * ../../node_modules/bulma/sass/components */ -@use "variables" as *; +@use "variables" as local; @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; @@ -28,21 +26,33 @@ } #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($tablet) { - width: 100%; - justify-content: space-around; + @include until($desktop) { + display: table; + // width: 100%; + // 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; @@ -131,7 +141,7 @@ */ .footer .views-field { .field-content { - background-color: rgba($offwhite, 0.9); + background-color: rgba(local.$offwhite, 0.9); padding: 0.2em; border-radius: 0.3em; } @@ -147,14 +157,14 @@ } .page-title .title > span { - background-color: rgba($offwhite, 0.66); + background-color: rgba(local.$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($offwhite, 0.9); + background-color: rgba(local.$offwhite, 0.9); padding: 0.2em; border-radius: 0.3em; } diff --git a/web/themes/custom/geofresco/src/global/_content.scss b/web/themes/custom/geofresco/src/global/_content.scss index f7df403..5654cd3 100644 --- a/web/themes/custom/geofresco/src/global/_content.scss +++ b/web/themes/custom/geofresco/src/global/_content.scss @@ -1,7 +1,4 @@ -/** - * Styles related to contributor-added content on the site, such as embedded - * media. - */ +// Styles for contributor-added content on the site, such as embedded media. iframe { width: 100%; @@ -10,3 +7,8 @@ iframe { height: revert-layer; } } + +// Header tabs section is only shown to content editors for the Edit etc tabs. +.header-tabs { + padding: 0; +} \ No newline at end of file diff --git a/web/themes/custom/geofresco/src/global/_elements.scss b/web/themes/custom/geofresco/src/global/_elements.scss index d147f9c..45c059e 100644 --- a/web/themes/custom/geofresco/src/global/_elements.scss +++ b/web/themes/custom/geofresco/src/global/_elements.scss @@ -26,11 +26,15 @@ .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; } @@ -52,6 +56,7 @@ .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 { diff --git a/web/themes/custom/geofresco/src/global/_layout.scss b/web/themes/custom/geofresco/src/global/_layout.scss index 938ca4b..f7423b0 100644 --- a/web/themes/custom/geofresco/src/global/_layout.scss +++ b/web/themes/custom/geofresco/src/global/_layout.scss @@ -5,12 +5,12 @@ @use "../../node_modules/bulma/sass/utilities/mixins"; @use "../../node_modules/bulma/sass/utilities/initial-variables" as *; -// Center logo & sitename when they stack on tiny screens. +// Allow sitename to slide over the logo on tiny screens. @include mixins.until(local.$mini) { .geo-logo-name .sitename { position: absolute; left: calc(100vw - 14rem); - top: 0.5rem; + top: 0; } // .logo.column { // width: 100%; @@ -18,10 +18,14 @@ .navigation.column .hamburger { position: absolute; right: 0; - top: 0.5rem; + top: 0; } } +.search-bar { + padding-top: 1.75rem; +} + .search-bar > .block, .logo > .image { display: inline-block; diff --git a/web/themes/custom/geofresco/src/global/_paint.scss b/web/themes/custom/geofresco/src/global/_paint.scss index 6601345..2e40e3e 100644 --- a/web/themes/custom/geofresco/src/global/_paint.scss +++ b/web/themes/custom/geofresco/src/global/_paint.scss @@ -63,3 +63,14 @@ .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; +} diff --git a/web/themes/custom/geofresco/src/global/global.scss b/web/themes/custom/geofresco/src/global/global.scss index a762629..9f66817 100644 --- a/web/themes/custom/geofresco/src/global/global.scss +++ b/web/themes/custom/geofresco/src/global/global.scss @@ -6,6 +6,8 @@ @forward "../../node_modules/bulma/sass/utilities" with ( $background: white, + $green: $geo-green, + $blue: $blue, ); @forward "fonts"; @forward "../../node_modules/bulma/sass/base/_index"; @@ -15,18 +17,26 @@ @forward "../../node_modules/bulma/sass/form/_index"; @forward "form"; // $navbar-breakpoint: calc($mini/2); -@forward "../../node_modules/bulma/sass/components/_index"; +@forward "../../node_modules/bulma/sass/components/_index" with ( + $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'; From 44ce05b04a5df21ae3cb2eb1a2edf74886d07a7a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?benjamin=20melan=C3=A7on?= Date: Mon, 21 Jul 2025 01:08:30 -0400 Subject: [PATCH 07/10] Fix templates; remove non-present Bulma modifier --- .../src/templates/block/block--system-branding-block.html.twig | 2 +- .../src/templates/layout/region--header-tabs.html.twig | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/web/themes/custom/geofresco/src/templates/block/block--system-branding-block.html.twig b/web/themes/custom/geofresco/src/templates/block/block--system-branding-block.html.twig index 9b743af..e1c3325 100644 --- a/web/themes/custom/geofresco/src/templates/block/block--system-branding-block.html.twig +++ b/web/themes/custom/geofresco/src/templates/block/block--system-branding-block.html.twig @@ -14,7 +14,7 @@ * @ingroup themeable */ #} -
+
{% if site_logo %}