From 89f1bf9974e25b85a819eb2fbef39d783567bf41 Mon Sep 17 00:00:00 2001 From: Joshua Nicholson <94021017+jnicholCU@users.noreply.github.com> Date: Mon, 22 Jan 2024 13:53:47 -0700 Subject: [PATCH 1/3] Claro switch Some cleanup for claro sandboxes --- boulder_base.info.yml | 2 +- templates/layout/page--403.html.twig | 2 +- templates/layout/page--search.html.twig | 2 +- templates/layout/page--user--login.html.twig | 2 +- templates/layout/page--user.html.twig | 2 +- templates/layout/page.html.twig | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/boulder_base.info.yml b/boulder_base.info.yml index 32dcb944..b8963d9b 100644 --- a/boulder_base.info.yml +++ b/boulder_base.info.yml @@ -3,7 +3,7 @@ description: "Drupal 9+ theme for CU Boulder branded web properties" package: Custom core_version_requirement: ^9 || ^10 type: theme -base theme: stable9 +base theme: claro libraries: - boulder_base/ucb-global diff --git a/templates/layout/page--403.html.twig b/templates/layout/page--403.html.twig index f9f8a10b..8823c6a1 100755 --- a/templates/layout/page--403.html.twig +++ b/templates/layout/page--403.html.twig @@ -44,7 +44,7 @@ */ #} -
+
{{ block("page_header", "page.html.twig") }} {{ page.highlighted }} diff --git a/templates/layout/page--search.html.twig b/templates/layout/page--search.html.twig index a6ca8bf6..35bfd9dd 100755 --- a/templates/layout/page--search.html.twig +++ b/templates/layout/page--search.html.twig @@ -46,7 +46,7 @@ {{ attach_library('boulder_base/ucb-search-page') }} -
+
{{ block("page_header", "page.html.twig") }} {{ page.highlighted }} diff --git a/templates/layout/page--user--login.html.twig b/templates/layout/page--user--login.html.twig index 2fc13b83..93043870 100755 --- a/templates/layout/page--user--login.html.twig +++ b/templates/layout/page--user--login.html.twig @@ -47,7 +47,7 @@ {{ attach_library('boulder_base/ucb-user-login') }} -
+
{{ block("page_header", "page.html.twig") }} {{ page.highlighted }} diff --git a/templates/layout/page--user.html.twig b/templates/layout/page--user.html.twig index 0bd05350..c099cc86 100755 --- a/templates/layout/page--user.html.twig +++ b/templates/layout/page--user.html.twig @@ -46,7 +46,7 @@ {{ attach_library('boulder_base/ucb-user-page') }} -
+
{{ block("page_header", "page.html.twig") }} {{ page.highlighted }} diff --git a/templates/layout/page.html.twig b/templates/layout/page.html.twig index 44f94a01..1e82fc97 100644 --- a/templates/layout/page.html.twig +++ b/templates/layout/page.html.twig @@ -46,7 +46,7 @@ -
+
{# HEADER CONTENT #} {% block page_header %} {{ attach_library('boulder_base/ucb-social-media') }} From af52b39b50e36f53e429f0b4490e6a2ca78a2bc3 Mon Sep 17 00:00:00 2001 From: Joshua Nicholson <94021017+jnicholCU@users.noreply.github.com> Date: Mon, 22 Jan 2024 14:37:54 -0700 Subject: [PATCH 2/3] Update style.css Removed local task css --- css/style.css | 35 ----------------------------------- 1 file changed, 35 deletions(-) diff --git a/css/style.css b/css/style.css index 7d5ec445..ae263b50 100644 --- a/css/style.css +++ b/css/style.css @@ -321,42 +321,7 @@ ul.ucb-main-menu.nav { } /****** Local Tasks ********/ -.ucb-local-tasks { - position: fixed; - top: 0; - width: 100%; - background-color: var(--ucb-link); - z-index: 99; - height: 32px; - padding: 0; - margin: 0; -} -.ucb-local-tasks ul { - display: flex; - list-style-type: none; - align-items: center; - justify-content: flex-start; - padding: 0; - margin: 0; -} - -.ucb-local-tasks ul li { - width: 100px; - padding: 0.25em; - text-align: center; - background-color: inherit; - color: inherit; -} - -.ucb-local-tasks ul li:hover { - background-color: rgba(255 255 255 / 15%); - transition: background-color 200ms; -} - -.ucb-local-tasks li>a:hover { - color: #fff; -} /********* Footer ***********/ From 0732018a1734654b61478f107130ad62728aee84 Mon Sep 17 00:00:00 2001 From: "Jeremy C. Sparks" Date: Wed, 24 Jan 2024 16:44:02 -0700 Subject: [PATCH 3/3] Not modifying the base theme for the main theme --- boulder_base.info.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boulder_base.info.yml b/boulder_base.info.yml index b8963d9b..32dcb944 100644 --- a/boulder_base.info.yml +++ b/boulder_base.info.yml @@ -3,7 +3,7 @@ description: "Drupal 9+ theme for CU Boulder branded web properties" package: Custom core_version_requirement: ^9 || ^10 type: theme -base theme: claro +base theme: stable9 libraries: - boulder_base/ucb-global