Skip to content

Commit

Permalink
Squashed 'docroot/profiles/lagunita/sul_profile/' changes from c2be7e…
Browse files Browse the repository at this point in the history
…98..9c912cf7

9c912cf7 Drupal 11.4 update
eee0f5cc D8CORE-7533: Change to the Quote style in the wysiwyg
a5c9a105 Fixup citation entity config export
ea7d466f Updated environment indicator settings after update
b3a131fc Update linkit module (#834)
dc29ebd2 D8CORE-7664: add gutters to accordions on full width
8ebcf8f8 D8CORE-7668: Adjust skip secondary nav anchor link
475ec657 D8CORE-7670: allow all language options in ckeditor

git-subtree-dir: docroot/profiles/lagunita/sul_profile
git-subtree-split: 9c912cf77f63bae2e112f4fb930aa7e4c5e3b399
  • Loading branch information
pookmish committed Dec 19, 2024
1 parent f220e2d commit 675765b
Show file tree
Hide file tree
Showing 18 changed files with 429 additions and 329 deletions.
7 changes: 2 additions & 5 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
"drupal/config_split": "^2.0",
"drupal/confirm_leave": "^1.0@beta",
"drupal/content_lock": "^2.2",
"drupal/core": "~10.3.0",
"drupal/core": "~10.4.0",
"drupal/cshs": "^4.0",
"drupal/default_content": "^2.0@alpha",
"drupal/diff": "^1.3",
Expand Down Expand Up @@ -102,7 +102,7 @@
"drupal/layout_paragraphs": "^2.0",
"drupal/link_attributes": "^2.0",
"drupal/link_title_formatter": "^2.0",
"drupal/linkit": "^6.0",
"drupal/linkit": "^7.0",
"drupal/markup": "^2.0",
"drupal/mathjax": "^4.0",
"drupal/maxlength": "^3.1",
Expand Down Expand Up @@ -183,9 +183,6 @@
}
},
"patches": {
"drupal/google_analytics": {
"https://www.drupal.org/project/google_analytics/issues/3373921": "https://www.drupal.org/files/issues/2023-08-07/google-analytics-issues-3373921-cannot-install-from-existing-config-11.patch"
},
"drupal/hook_event_dispatcher": {
"https://www.drupal.org/project/hook_event_dispatcher/issues/3354751": "https://www.drupal.org/files/issues/2024-03-14/hook_event_dispatcher-4.x-3354751-7.patch"
},
Expand Down
10 changes: 8 additions & 2 deletions config/sync/editor.editor.stanford_html.yml
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ settings:
async_metadata: true
recommended_enabled: false
ckeditor5_language:
language_list: un
language_list: all
ckeditor5_list:
properties:
reversed: true
Expand Down Expand Up @@ -169,8 +169,14 @@ settings:
label: 'Splash Font'
element: '<p class="su-font-splash">'
-
label: 'Quote Text'
label: 'Quote LG'
element: '<p class="su-quote-text">'
-
label: 'Quote MD'
element: '<p class="su-quote-text--md">'
-
label: 'Quote SM'
element: '<p class="su-quote-text--sm">'
-
label: 'Drop Cap First Letter'
element: '<p class="su-drop-cap">'
Expand Down
2 changes: 2 additions & 0 deletions config/sync/environment_indicator.settings.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,5 @@ _core:
toolbar_integration:
toolbar: toolbar
favicon: true
version_identifier: environment_indicator_current_release
version_identifier_fallback: deployment_identifier
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@ settings:
field_title_display: before
component_layout: default
show_component_required_marker: false
flag_required_input: false
credentials_inline: false
override_format: default
field_type:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@ settings:
field_title_display: before
component_layout: default
show_component_required_marker: false
flag_required_input: false
credentials_inline: false
override_format: default
field_type:
Expand Down
1 change: 1 addition & 0 deletions config/sync/field.field.citation.su_book.su_author.yml
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@ settings:
field_title_display: before
component_layout: default
show_component_required_marker: false
flag_required_input: false
credentials_inline: false
override_format: default
field_type:
Expand Down
1 change: 1 addition & 0 deletions config/sync/field.field.citation.su_other.su_author.yml
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@ settings:
field_title_display: before
component_layout: default
show_component_required_marker: false
flag_required_input: false
credentials_inline: false
override_format: default
field_type:
Expand Down
1 change: 1 addition & 0 deletions config/sync/field.field.citation.su_thesis.su_author.yml
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@ settings:
field_title_display: before
component_layout: default
show_component_required_marker: false
flag_required_input: false
credentials_inline: false
override_format: default
field_type:
Expand Down
2 changes: 1 addition & 1 deletion tests/codeception/acceptance/SystemCest.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ public function testSiteStatus(AcceptanceTester $I) {
$I->runDrush('xmlsitemap:rebuild');
$I->logInWithRole('administrator');
$I->amOnPage('/admin/reports/status');
$I->canSee('10.3', '.system-status-general-info');
$I->canSee('10.4', '.system-status-general-info');
if ($I->grabMultiple('.system-status-counter--error')) {
$I->canSee('1 Error', '.system-status-counter--error');
$I->canSee('Access to update.php ', '.system-status-report__status-icon--error');
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@

/**
* Test for the basic page content type.
*
* @group basic-page
*/
class BasicPageParagraphsCest {

Expand Down
2 changes: 1 addition & 1 deletion themes/stanford_basic/dist/css/ckeditor5.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion themes/stanford_basic/dist/css/components.css

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions themes/stanford_basic/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,16 +23,16 @@
"element-qsa-scope": "^1.1.0",
"es6-object-assign": "^1.1.0",
"filemanager-webpack-plugin": "^8.0.0",
"mini-css-extract-plugin": "^2.9.1",
"mini-css-extract-plugin": "^2.9.2",
"node-sass": "^9.0.0",
"optimize-css-assets-webpack-plugin": "^6.0.1",
"postcss-loader": "^8.1.1",
"postcss-preset-env": "^10.0.8",
"sass-loader": "^16.0.2",
"postcss-preset-env": "^10.1.1",
"sass-loader": "^16.0.4",
"style-loader": "^4.0.0",
"webpack": "^5.96.0",
"webpack": "^5.97.1",
"webpack-cli": "^5.1.4",
"webpack-remove-empty-scripts": "^1.0.4"
},
"packageManager": "[email protected].1"
"packageManager": "[email protected].3"
}
5 changes: 5 additions & 0 deletions themes/stanford_basic/src/scss/ckeditor5.scss
Original file line number Diff line number Diff line change
Expand Up @@ -303,3 +303,8 @@
}
}
}

ul[aria-label="Language"] {
max-height: 250px;
overflow-y: scroll;
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,25 @@
// Add theme customizations here.

.ptype-stanford-faq {
margin: 0 auto;
width: 100%;
max-width: calc(100vw - #{map-get($su-screen-margins, 'xs') * 2});

@include grid-media('sm') {
max-width: calc(100vw - #{map-get($su-screen-margins, 'sm') * 2});
}

@include grid-media('md') {
max-width: calc(100vw - #{map-get($su-screen-margins, 'md') * 2});
}

@include grid-media('lg') {
max-width: 880px;
}

@include grid-media('xl') {
max-width: 980px;
}

.expand-collapse-button {
float: right;
Expand All @@ -18,7 +37,7 @@
color: $su-color-digital-red;
}

&:hover::after{
&:hover::after {
color: $su-color-black;
text-underline: none;
}
Expand All @@ -33,7 +52,22 @@

.su-faq-headline {
display: flex;
flex-direction: column;
justify-content: space-between;

@include grid-media('sm') {
gap: 10px;
flex-direction: row;
}

.button-wrapper {
margin-left: auto;
margin-bottom: 10px;

@include grid-media('sm') {
margin-bottom: 0;
}
}
}

.su-faq-questions {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
{% set attributes = attributes.setAttribute('aria-labelledby', button_label) %}
{% set attributes = attributes.addClass(classes) %}

<a href="#main-content" class="visually-hidden focusable su-skipnav su-skipnav--content">{{ 'Skip to main content'|t }}</a>
<a href="#main-content" class="visually-hidden focusable su-skipnav su-skipnav--content">{{ 'Skip Secondary Navigation'|t }}</a>
<nav{{ attributes }}>
<div id="secondary-navigation" tabindex="-1" class="visually-hidden focusable">{{ 'Secondary Navigation'|t }}</div>
{# Label. If not displayed, we still provide it for screen readers. #}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
{% set attributes = attributes.setAttribute('aria-label', aria_label|default('secondary menu')) %}
{# Macros #}
{%- import "@basic/menus/macros/secondary-nav-menu.twig" as menus -%}
<a href="#main-content" class="visually-hidden focusable su-skipnav su-skipnav--content">{{ 'Skip to main content'|t }}</a>
<a href="#main-content" class="visually-hidden focusable su-skipnav su-skipnav--content">{{ 'Skip Secondary Navigation'|t }}</a>
<nav{{ attributes }}>
<div id="secondary-navigation" tabindex="-1" class="visually-hidden focusable">{{ 'Secondary Navigation'|t }}</div>
{% apply spaceless %}
Expand Down
Loading

0 comments on commit 675765b

Please sign in to comment.