From eec6664ca35e90b3cf1cfd2d40f2417682376fe2 Mon Sep 17 00:00:00 2001 From: Github Actions Date: Wed, 26 Jun 2024 17:29:39 +0000 Subject: [PATCH 1/3] 11.1.1 --- .../humsci/su_humsci_profile/su_humsci_profile.info.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docroot/profiles/humsci/su_humsci_profile/su_humsci_profile.info.yml b/docroot/profiles/humsci/su_humsci_profile/su_humsci_profile.info.yml index bf4c77b415..a5aa07537b 100644 --- a/docroot/profiles/humsci/su_humsci_profile/su_humsci_profile.info.yml +++ b/docroot/profiles/humsci/su_humsci_profile/su_humsci_profile.info.yml @@ -1,7 +1,7 @@ name: 'Stanford HumSci' type: profile description: 'Installation profile for HumSci Drupal' -version: 11.1.0 +version: 11.1.1 core_version_requirement: '^9.4 || ^10' themes: - material_admin From f90c32cff8a0a1a828f58a71dfb5587c2d043c12 Mon Sep 17 00:00:00 2001 From: Joe Gilliland-Lloyd <6943710+joegl@users.noreply.github.com> Date: Wed, 26 Jun 2024 13:00:52 -0500 Subject: [PATCH 2/3] Run dependency updates on 11.x release branches (#1565) * Run dependency updates on 11.x release branches. --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index cb2f0ecc71..7bbbb661c2 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -100,6 +100,6 @@ workflows: filters: branches: only: - - /10\..*-release/ + - /11\..*-release/ jobs: - run-updates From 68e81257f7dc712b49e4d319073a738f2e93ddb7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9s=20D=C3=ADaz=20Soto?= Date: Thu, 27 Jun 2024 09:33:47 -0600 Subject: [PATCH 3/3] fix(shs-5673): Add color variables to wysiwyg css (#1566) * fix(shs-5673): Add color variables to wysiwyg css. --- .../src/scss/ckeditor/imports.scss | 23 ++++++++++++++++++- .../_variables.colorful-pairings.scss | 2 ++ .../_variables.traditional-pairings.scss | 2 ++ 3 files changed, 26 insertions(+), 1 deletion(-) diff --git a/docroot/themes/humsci/humsci_basic/src/scss/ckeditor/imports.scss b/docroot/themes/humsci/humsci_basic/src/scss/ckeditor/imports.scss index 44905d6968..dd2f80029a 100644 --- a/docroot/themes/humsci/humsci_basic/src/scss/ckeditor/imports.scss +++ b/docroot/themes/humsci/humsci_basic/src/scss/ckeditor/imports.scss @@ -3,6 +3,7 @@ // the dependencies and the files we need. See _main.scss and // _base.scss for reference. @charset 'UTF-8'; +@use "sass:map"; // Here we add the path to Font Awesome. This is copied from _main.scss // and necessary for icons in CKEditor styles. @@ -30,7 +31,7 @@ $px-only: true; "../tools/mixins.buttons", "../tools/mixins.menu-icons", "../tools/mixins.icons", "../tools/mixins.lists", "../tools/mixins.tables", "../tools/mixins.heros", "../tools/mixins.slick", "../tools/keyframes.text", - "../utilities/color-pairings", "../utilities/fonts", "../utilities/font-awesome", "../utilities/general", + "../utilities/color-pairings", "../utilities/fonts", "../utilities/font-awesome", "../utilities/general", "../utilities/lists", "../utilities/raised-cards", "../utilities/tables", "../utilities/display-more-link-text", "../utilities/dark-pattern", "../utilities/caption-credit", "../utilities/media-embeds", @@ -40,6 +41,26 @@ $px-only: true; // See _base.scss in basic theme. We only need the below for CKEditor. // Otherwise styles affect the entire admin UI. +:root { + @include hb-themes(("colorful", "airy")) { + @each $color, $value in map.get($hc-colorful-pairings, $hb-colorful-default) { + --palette--#{$color}: #{$value}; + } + @each $color, $value in $hc-colorful-globals { + --palette--#{$color}: #{$value}; + } + } + + @include hb-traditional { + @each $color, $value in map.get($ht-traditional-pairings, $hb-traditional-default) { + --palette--#{$color}: #{$value}; + } + @each $color, $value in $ht-traditional-globals { + --palette--#{$color}: #{$value}; + } + } +} + .ck-editor__main { @include font-smoothing; diff --git a/docroot/themes/humsci/humsci_basic/src/scss/settings/_variables.colorful-pairings.scss b/docroot/themes/humsci/humsci_basic/src/scss/settings/_variables.colorful-pairings.scss index f64f0cf4f8..7b4af6de90 100644 --- a/docroot/themes/humsci/humsci_basic/src/scss/settings/_variables.colorful-pairings.scss +++ b/docroot/themes/humsci/humsci_basic/src/scss/settings/_variables.colorful-pairings.scss @@ -1,5 +1,7 @@ // COLORFUL +$hb-colorful-default: 'cardinal'; + // Each color pairing has a palette of color swatches $hc-colorful-pairings: ( 'ocean': ( diff --git a/docroot/themes/humsci/humsci_basic/src/scss/settings/_variables.traditional-pairings.scss b/docroot/themes/humsci/humsci_basic/src/scss/settings/_variables.traditional-pairings.scss index 4a5c3eecf6..9db3ea5554 100644 --- a/docroot/themes/humsci/humsci_basic/src/scss/settings/_variables.traditional-pairings.scss +++ b/docroot/themes/humsci/humsci_basic/src/scss/settings/_variables.traditional-pairings.scss @@ -1,5 +1,7 @@ // TRADITIONAL +$hb-traditional-default: 'cardinal'; + // Each color pairing has a palette of color swatches $ht-traditional-pairings: ( 'cardinal': (