Merge commit 'eb28ba2e26189479b835282a3cda3da90cf6a2b5' into 2.x

docroot/profiles/lagunita/sul_profile/config/sync/core.extension.yml

@@ -217,6 +217,7 @@ module:
   token: 0
   token_or: 0
   toolbar: 0
+  trash: 0
   typed_data: 0
   ui_patterns: 0
   ui_patterns_ds: 0

docroot/profiles/lagunita/sul_profile/config/sync/editor.editor.stanford_html.yml

@@ -169,14 +169,8 @@ settings:
           label: 'Splash Font'
           element: '<p class="su-font-splash">'
         -
-          label: 'Quote LG'
+          label: 'Quote'
           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">'

docroot/profiles/lagunita/sul_profile/config/sync/editoria11y.settings.yml

@@ -15,5 +15,7 @@ shadow_components: ''
 disable_sync: false
 preserve_params: ''
 custom_tests: 0
+disable_live: false
+live_h2: 'form[id^="node-"] #edit-body-wrapper .ck-content'
 ignore_containers: .su-secondary-nav
 allow_overflow: ''

docroot/profiles/lagunita/sul_profile/config/sync/field.field.config_pages.lockup_settings.su_intro.yml

@@ -20,6 +20,6 @@ default_value:
 default_value_callback: ''
 settings:
   markup:
-    value: "<div><p><img alt=\"\" src=\"https://su-sws.github.io/stanford_basic/src/assets/img/lockup-example.png\" /></p>\r\n\r\n<p>These lockup options are only available on Stanford Basic. Users of the Minimally Branded or Faculty themes should use the default lockup. To determine which lockup is right for your official unity, consult the <a href=\"https://identity.stanford.edu/component/identity-lockup/\">Stanford Identity Guide.</a></p>\r\n\r\n<p>This lockup will appear in the top left corner of the website's main header. Separate settings for the lockup at the bottom of your site can be found in the <a href=\"/admin/config/system/local-footer\">Local Footer settings</a> and will not be affected by changes you make here.</p>\r\n</div>"
+    value: '<div><p><img src="https://su-sws.github.io/stanford_basic/src/assets/img/lockup-example.png" alt=""></p><p>These branding options are only available on Stanford Basic. Users of the Minimally Branded or Faculty themes should use the default lockup. To determine which lockup is right for your official unity, consult <a href="https://identity.stanford.edu/visual-identity/stanford-logos/department-branding/">Department Branding</a> section of the Stanford Identity Guide.</p><p>This branding will appear in the top left corner of the header section for your site. Separate settings for the lockup at the bottom of your site can be found in the <a href="/admin/config/system/local-footer">Local Footer settings</a> and will not be affected by changes you make here.</p></div>'
     format: stanford_html
 field_type: markup

docroot/profiles/lagunita/sul_profile/config/sync/trash.settings.yml

@@ -0,0 +1,7 @@
+_core:
+  default_config_hash: 6RYN2q1x9xeZY4gCN37ZqpEgHrLUQKEscWRd9UovdL0
+enabled_entity_types:
+  node: {  }
+auto_purge:
+  enabled: true
+  after: '30 days'

docroot/profiles/lagunita/sul_profile/config/sync/ultimate_cron.job.trash_cron.yml

@@ -0,0 +1,17 @@
+uuid: e669d5e4-9136-4ade-8b67-12e03ee08043
+langcode: en
+status: true
+dependencies:
+  module:
+    - trash
+title: 'Default cron handler'
+id: trash_cron
+weight: 0
+module: trash
+callback: 'trash#cron'
+scheduler:
+  id: simple
+launcher:
+  id: serial
+logger:
+  id: database

docroot/profiles/lagunita/sul_profile/tests/codeception/acceptance/Content/SearchBlockCest.php

@@ -17,7 +17,7 @@ public function __construct() {
     $this->faker = Factory::create();
   }
 
-  public function __before() {
+  public function _before() {
     if ($cp = ConfigPages::load('stanford_basic_site_settings')) {
       $cp->delete();
     }

docroot/profiles/lagunita/sul_profile/tests/codeception/acceptance/SystemSiteConfigCest.php

@@ -27,7 +27,7 @@ public function __construct() {
   /**
    * Delete the config page after the test finishes.
    */
-  public function __after(AcceptanceTester $I) {
+  public function _after(AcceptanceTester $I) {
     if ($config_page = ConfigPages::load('stanford_basic_site_settings')) {
       $config_page->delete();
     }

docroot/profiles/lagunita/sul_profile/tests/codeception/functional/Contrib/RedirectImportCest.php

@@ -10,7 +10,7 @@ class RedirectImportCest {
   /**
    * Cleanup.
    */
-  public function __after() {
+  public function _after() {
     if (file_exists(codecept_data_dir('/redirects.csv'))) {
       unlink(codecept_data_dir('/redirects.csv'));
     }

docroot/profiles/lagunita/sul_profile/tests/codeception/functional/Navigation/NavigationDropDownsCest.php

@@ -26,7 +26,7 @@ public function __construct() {
   /**
    * Cleanup after test.
    */
-  public function __after(FunctionalTester $I) {
+  public function _after(FunctionalTester $I) {
     \Drupal::entityTypeManager()
       ->getStorage('config_pages')
       ->load('stanford_basic_site_settings')

docroot/profiles/lagunita/sul_profile/themes/stanford_basic/src/scss/ckeditor5.scss

@@ -128,7 +128,6 @@
       margin-bottom: 2.5rem;
       font-weight: 400;
       line-height: 1.5;
-      max-width: 85rem;
       letter-spacing: -0.012em;
       font-size: 30px;
     }
@@ -159,7 +158,6 @@
       font-size: 30px;
       font-weight: 400;
       line-height: 1.5;
-      max-width: 85rem;
       letter-spacing: -0.012em;
       margin-top: 0;
     }

docroot/profiles/lagunita/sul_profile/themes/stanford_basic/src/scss/components/wysiwyg/_line_length.scss

@@ -6,10 +6,6 @@
 // This sets a maximum width based the size of the letter "O".
 
 .su-wysiwyg-text {
-  p {
-    max-width: 100ch;
-  }
-
   p {
     &.text-align-right {
       text-align: right;