diff --git a/config/default/block.block.exposed_form_hs_search_search_page.yml b/config/default/block.block.exposed_form_hs_search_search_page.yml deleted file mode 100644 index dbf3d2f55a..0000000000 --- a/config/default/block.block.exposed_form_hs_search_search_page.yml +++ /dev/null @@ -1,30 +0,0 @@ -uuid: fe8462d6-50fe-4988-8f59-d7eeddf90052 -langcode: en -status: true -dependencies: - config: - - views.view.hs_search - module: - - block_class - - system - - views - theme: - - su_humsci_theme -id: exposed_form_hs_search_search_page -theme: su_humsci_theme -region: content -weight: 0 -provider: null -plugin: 'views_exposed_filter_block:hs_search-search_page' -settings: - id: 'views_exposed_filter_block:hs_search-search_page' - label: '' - label_display: visible - provider: views - views_label: '' -visibility: - request_path: - id: request_path - negate: false - context_mapping: { } - pages: /search diff --git a/config/default/block.block.exposed_form_hs_searchsearch_page.yml b/config/default/block.block.exposed_form_hs_searchsearch_page.yml deleted file mode 100644 index 57f39057b1..0000000000 --- a/config/default/block.block.exposed_form_hs_searchsearch_page.yml +++ /dev/null @@ -1,24 +0,0 @@ -uuid: 1e244051-4fea-4a30-a32f-63a61a51fcb1 -langcode: en -status: true -dependencies: - config: - - views.view.hs_search - module: - - block_class - - views - theme: - - su_humsci_theme -id: exposed_form_hs_searchsearch_page -theme: su_humsci_theme -region: search -weight: 0 -provider: null -plugin: 'views_exposed_filter_block:hs_search-search_page' -settings: - id: 'views_exposed_filter_block:hs_search-search_page' - label: '' - label_display: '0' - provider: views - views_label: '' -visibility: { } diff --git a/config/default/block.block.hs_about.yml b/config/default/block.block.hs_about.yml deleted file mode 100644 index 31b8285091..0000000000 --- a/config/default/block.block.hs_about.yml +++ /dev/null @@ -1,29 +0,0 @@ -uuid: 2975689e-d6cb-4b01-8755-59423e751d66 -langcode: en -status: true -dependencies: - content: - - 'block_content:hs_basic_block:4f4fde75-b73c-4494-850b-e61e19776137' - module: - - block_class - - block_content - theme: - - su_humsci_theme -third_party_settings: - block_class: - classes: decanter-width-one-fourth -id: hs_about -theme: su_humsci_theme -region: footer -weight: -6 -provider: null -plugin: 'block_content:4f4fde75-b73c-4494-850b-e61e19776137' -settings: - id: 'block_content:4f4fde75-b73c-4494-850b-e61e19776137' - label: About - label_display: visible - provider: block_content - status: true - info: '' - view_mode: full -visibility: { } diff --git a/config/default/block.block.hs_connectwithus.yml b/config/default/block.block.hs_connectwithus.yml deleted file mode 100644 index ac58658799..0000000000 --- a/config/default/block.block.hs_connectwithus.yml +++ /dev/null @@ -1,29 +0,0 @@ -uuid: 0f12ffa7-87cb-4a3d-89fc-b173eab76260 -langcode: en -status: true -dependencies: - content: - - 'block_content:hs_basic_block:985ebfed-df24-487c-8602-51dc3bdcde84' - module: - - block_class - - block_content - theme: - - su_humsci_theme -third_party_settings: - block_class: - classes: decanter-width-one-fourth -id: hs_connectwithus -theme: su_humsci_theme -region: footer -weight: -4 -provider: null -plugin: 'block_content:985ebfed-df24-487c-8602-51dc3bdcde84' -settings: - id: 'block_content:985ebfed-df24-487c-8602-51dc3bdcde84' - label: 'Connect With Us' - label_display: visible - provider: block_content - status: true - info: '' - view_mode: full -visibility: { } diff --git a/config/default/block.block.hs_contactus.yml b/config/default/block.block.hs_contactus.yml deleted file mode 100644 index a31a45ccbe..0000000000 --- a/config/default/block.block.hs_contactus.yml +++ /dev/null @@ -1,29 +0,0 @@ -uuid: aaf73945-f3bb-4bb6-b785-abace593d5d5 -langcode: en -status: true -dependencies: - content: - - 'block_content:hs_basic_block:ec7040d9-e884-461d-a529-49a78fa01d25' - module: - - block_class - - block_content - theme: - - su_humsci_theme -third_party_settings: - block_class: - classes: decanter-width-one-fourth -id: hs_contactus -theme: su_humsci_theme -region: footer -weight: -3 -provider: null -plugin: 'block_content:ec7040d9-e884-461d-a529-49a78fa01d25' -settings: - id: 'block_content:ec7040d9-e884-461d-a529-49a78fa01d25' - label: 'Contact Us' - label_display: visible - provider: block_content - status: true - info: '' - view_mode: full -visibility: { } diff --git a/config/default/block.block.hs_people.yml b/config/default/block.block.hs_people.yml deleted file mode 100644 index 7a960118b6..0000000000 --- a/config/default/block.block.hs_people.yml +++ /dev/null @@ -1,29 +0,0 @@ -uuid: 49516a40-796b-408d-b891-7fa2e9b0ff60 -langcode: en -status: true -dependencies: - content: - - 'block_content:hs_basic_block:2b7335a6-d3a4-468b-b515-9b1e2be558bc' - module: - - block_class - - block_content - theme: - - su_humsci_theme -third_party_settings: - block_class: - classes: decanter-width-one-fourth -id: hs_people -theme: su_humsci_theme -region: footer -weight: -5 -provider: null -plugin: 'block_content:2b7335a6-d3a4-468b-b515-9b1e2be558bc' -settings: - id: 'block_content:2b7335a6-d3a4-468b-b515-9b1e2be558bc' - label: People - label_display: visible - provider: block_content - status: true - info: '' - view_mode: full -visibility: { } diff --git a/config/default/block.block.su_humsci_theme_branding.yml b/config/default/block.block.su_humsci_theme_branding.yml deleted file mode 100644 index 1d13147091..0000000000 --- a/config/default/block.block.su_humsci_theme_branding.yml +++ /dev/null @@ -1,25 +0,0 @@ -uuid: 025f2db0-a3a6-4e99-9a9a-db190657c76c -langcode: en -status: true -dependencies: - module: - - system - theme: - - su_humsci_theme -_core: - default_config_hash: TgAwjAhbo03mRiTPNzXKNA6CgpAjayATZ3Ui2DpNTY0 -id: su_humsci_theme_branding -theme: su_humsci_theme -region: header -weight: 0 -provider: null -plugin: system_branding_block -settings: - id: system_branding_block - label: 'Site branding' - label_display: '0' - provider: system - use_site_logo: true - use_site_name: true - use_site_slogan: true -visibility: { } diff --git a/config/default/block.block.su_humsci_theme_content.yml b/config/default/block.block.su_humsci_theme_content.yml deleted file mode 100644 index e84c535237..0000000000 --- a/config/default/block.block.su_humsci_theme_content.yml +++ /dev/null @@ -1,22 +0,0 @@ -uuid: e82446dd-23f3-43a5-b0f4-d40a533a336b -langcode: en -status: true -dependencies: - module: - - system - theme: - - su_humsci_theme -_core: - default_config_hash: OLvNDDzewXPxlm6tSQO9AiwOpBPkUzRzlVapESVO4nQ -id: su_humsci_theme_content -theme: su_humsci_theme -region: content -weight: 0 -provider: null -plugin: system_main_block -settings: - id: system_main_block - label: 'Main page content' - label_display: '0' - provider: system -visibility: { } diff --git a/config/default/block.block.su_humsci_theme_footer.yml b/config/default/block.block.su_humsci_theme_footer.yml deleted file mode 100644 index 4cd356ed05..0000000000 --- a/config/default/block.block.su_humsci_theme_footer.yml +++ /dev/null @@ -1,27 +0,0 @@ -uuid: 6d8fca7c-6e2b-4db3-9c63-899289954b24 -langcode: en -status: true -dependencies: - config: - - system.menu.footer - module: - - system - theme: - - su_humsci_theme -_core: - default_config_hash: U4ZrT9JspRQEFPIi8WPTe2yagUyZQiMNFwQZ7xZtL5k -id: su_humsci_theme_footer -theme: su_humsci_theme -region: footer -weight: -7 -provider: null -plugin: 'system_menu_block:footer' -settings: - id: 'system_menu_block:footer' - label: 'Footer menu' - label_display: '0' - provider: system - level: 1 - depth: 0 - expand_all_items: false -visibility: { } diff --git a/config/default/block.block.su_humsci_theme_help.yml b/config/default/block.block.su_humsci_theme_help.yml deleted file mode 100644 index 68504699a5..0000000000 --- a/config/default/block.block.su_humsci_theme_help.yml +++ /dev/null @@ -1,22 +0,0 @@ -uuid: a0fcb6c2-9a46-4682-bddc-34f4889c278b -langcode: en -status: true -dependencies: - module: - - help - theme: - - su_humsci_theme -_core: - default_config_hash: 7BtoEqJPxfoSIZoLVZeS6qis4pOPAGwQduLVxDe9hlg -id: su_humsci_theme_help -theme: su_humsci_theme -region: help -weight: -30 -provider: null -plugin: help_block -settings: - id: help_block - label: Help - label_display: '0' - provider: help -visibility: { } diff --git a/config/default/block.block.su_humsci_theme_local_actions.yml b/config/default/block.block.su_humsci_theme_local_actions.yml deleted file mode 100644 index cb30e0aabf..0000000000 --- a/config/default/block.block.su_humsci_theme_local_actions.yml +++ /dev/null @@ -1,20 +0,0 @@ -uuid: cb04192a-9903-4e66-a1c0-5f1a31d24436 -langcode: en -status: true -dependencies: - theme: - - su_humsci_theme -_core: - default_config_hash: INh1K21VTmuJ_Z77mnYKl2v7FBKzpaiR5m_X5EJ_Zrw -id: su_humsci_theme_local_actions -theme: su_humsci_theme -region: content -weight: -20 -provider: null -plugin: local_actions_block -settings: - id: local_actions_block - label: 'Primary admin actions' - label_display: '0' - provider: core -visibility: { } diff --git a/config/default/block.block.su_humsci_theme_local_tasks.yml b/config/default/block.block.su_humsci_theme_local_tasks.yml deleted file mode 100644 index 8e616d0bc8..0000000000 --- a/config/default/block.block.su_humsci_theme_local_tasks.yml +++ /dev/null @@ -1,22 +0,0 @@ -uuid: ab8cfd4b-b68d-428e-81e6-aa809da521b1 -langcode: en -status: true -dependencies: - theme: - - su_humsci_theme -_core: - default_config_hash: 8nR0Fpy3b231jFCvpZwnU1J2BoAqOeVH0jpToo_Ybj4 -id: su_humsci_theme_local_tasks -theme: su_humsci_theme -region: content -weight: -40 -provider: null -plugin: local_tasks_block -settings: - id: local_tasks_block - label: Tabs - label_display: '0' - provider: core - primary: true - secondary: true -visibility: { } diff --git a/config/default/block.block.su_humsci_theme_main_menu.yml b/config/default/block.block.su_humsci_theme_main_menu.yml deleted file mode 100644 index 964fd72b9c..0000000000 --- a/config/default/block.block.su_humsci_theme_main_menu.yml +++ /dev/null @@ -1,28 +0,0 @@ -uuid: 775df0b8-e6f0-4e8b-9067-6688b693b4b4 -langcode: en -status: true -dependencies: - config: - - system.menu.main - module: - - block_class - - system - theme: - - su_humsci_theme -_core: - default_config_hash: KCENbCpTWbHGshxBisDQrMiEtvwJimjwNZydjbQn8WQ -id: su_humsci_theme_main_menu -theme: su_humsci_theme -region: menu -weight: 0 -provider: null -plugin: 'system_menu_block:main' -settings: - id: 'system_menu_block:main' - label: 'Main navigation' - label_display: '0' - provider: system - level: 1 - depth: 2 - expand_all_items: false -visibility: { } diff --git a/config/default/block.block.su_humsci_theme_masquerade.yml b/config/default/block.block.su_humsci_theme_masquerade.yml deleted file mode 100644 index 45a765539e..0000000000 --- a/config/default/block.block.su_humsci_theme_masquerade.yml +++ /dev/null @@ -1,27 +0,0 @@ -uuid: 5fa72604-bf67-47de-9209-b26c956f887c -langcode: en -status: true -dependencies: - module: - - masquerade - - system - theme: - - su_humsci_theme -id: su_humsci_theme_masquerade -theme: su_humsci_theme -region: content -weight: 0 -provider: null -plugin: masquerade -settings: - id: masquerade - label: Masquerade - label_display: visible - provider: masquerade - show_unmasquerade_link: false -visibility: - request_path: - id: request_path - negate: false - context_mapping: { } - pages: '/user/*' diff --git a/config/default/block.block.su_humsci_theme_messages.yml b/config/default/block.block.su_humsci_theme_messages.yml deleted file mode 100644 index 7486a7ea0c..0000000000 --- a/config/default/block.block.su_humsci_theme_messages.yml +++ /dev/null @@ -1,22 +0,0 @@ -uuid: f155e51d-7490-4a8a-afa2-a9b060bf6e36 -langcode: en -status: true -dependencies: - module: - - system - theme: - - su_humsci_theme -_core: - default_config_hash: SxFrUXCwnbLDb8G3jWaa47iDtIP62fBHWjpcSzohabY -id: su_humsci_theme_messages -theme: su_humsci_theme -region: highlighted -weight: 0 -provider: null -plugin: system_messages_block -settings: - id: system_messages_block - label: 'Status messages' - label_display: '0' - provider: system -visibility: { } diff --git a/config/default/block.block.su_humsci_theme_page_title.yml b/config/default/block.block.su_humsci_theme_page_title.yml deleted file mode 100644 index 162c02a9b9..0000000000 --- a/config/default/block.block.su_humsci_theme_page_title.yml +++ /dev/null @@ -1,27 +0,0 @@ -uuid: 0c49e21e-69bd-4be9-9147-ba13a53231ca -langcode: en -status: true -dependencies: - module: - - system - theme: - - su_humsci_theme -_core: - default_config_hash: a4moGbv6UA5goxVuMTkffURbb8KBThCkMbTP6sRiSmg -id: su_humsci_theme_page_title -theme: su_humsci_theme -region: content -weight: -50 -provider: null -plugin: page_title_block -settings: - id: page_title_block - label: 'Page title' - label_display: '0' - provider: core -visibility: - request_path: - id: request_path - negate: true - context_mapping: { } - pages: '/node/*' diff --git a/config/default/config_ignore.settings.yml b/config/default/config_ignore.settings.yml index e19d49788f..9cf7aa8e7a 100644 --- a/config/default/config_ignore.settings.yml +++ b/config/default/config_ignore.settings.yml @@ -6,7 +6,6 @@ ignored_config_entities: - '~block.block.claro*' - '~block.block.gin*' - '~block.block.su_humsci_gin_admin*' - - '~block.block.su_humsci_theme*' - '~block.block.humsci_basic_*' - '~block.block.humsci_colorful_*' - '~block.block.humsci_traditional_*' diff --git a/config/default/core.extension.yml b/config/default/core.extension.yml index 21225abb9d..e96a29123d 100644 --- a/config/default/core.extension.yml +++ b/config/default/core.extension.yml @@ -279,7 +279,6 @@ theme: gin: 0 su_humsci_gin_admin: 0 stanford_basic: 0 - su_humsci_theme: 0 humsci_basic: 0 humsci_colorful: 0 humsci_traditional: 0 diff --git a/config/envs/local/config_ignore.settings.yml b/config/envs/local/config_ignore.settings.yml index 62b3cce761..49ed31d4c0 100644 --- a/config/envs/local/config_ignore.settings.yml +++ b/config/envs/local/config_ignore.settings.yml @@ -2,7 +2,6 @@ _core: default_config_hash: UVH1aJ4b44UM-VdPVN7hNNuuVqfReJxwfVeDQH1Hvsk ignored_config_entities: - 'system.theme:default' - - '~block.block.su_humsci_theme_*' - '~block.block.su_humsci_admin_*' - '~block.block.seven_*' - '~block.block.humsci_basic_*' diff --git a/docroot/modules/humsci/hs_layouts/hs_layouts.libraries.yml b/docroot/modules/humsci/hs_layouts/hs_layouts.libraries.yml index fd4288226c..61d574e51b 100644 --- a/docroot/modules/humsci/hs_layouts/hs_layouts.libraries.yml +++ b/docroot/modules/humsci/hs_layouts/hs_layouts.libraries.yml @@ -1,15 +1,22 @@ three_column_w_image: - version: VERSION css: layout: css/three-column-w-image.css: {} news_style: - version: VERSION css: layout: css/news-style.css: {} layout_builder_admin: - version: VERSION css: theme: css/hs_layouts.layout_builder_admin.css: {} +images_loaded: + remote: https://imagesloaded.desandro.com + license: + name: imagesLoaded + url: https://imagesloaded.desandro.com/#mit-license + js: + //imagesloaded.desandro.com/imagesloaded.pkgd.min.js: {type: external, minified: true } + dependencies: + - core/jquery + diff --git a/docroot/modules/humsci/hs_layouts/patterns/masonry/masonry.ui_patterns.yml b/docroot/modules/humsci/hs_layouts/patterns/masonry/masonry.ui_patterns.yml index 1eaac17c40..a5bb9b1f2c 100644 --- a/docroot/modules/humsci/hs_layouts/patterns/masonry/masonry.ui_patterns.yml +++ b/docroot/modules/humsci/hs_layouts/patterns/masonry/masonry.ui_patterns.yml @@ -46,6 +46,6 @@ masonry: //unpkg.com/masonry-layout@4.2.1/dist/masonry.pkgd.min.js: {type: external, minified: true } js/masonry.js: {} dependencies: - - su_humsci_theme/images_loaded + - hs_layouts/images_loaded use: "@hs_layouts/masonry/masonry.html.twig" diff --git a/docroot/modules/humsci/hs_layouts/scss/three-column-w-image.scss b/docroot/modules/humsci/hs_layouts/scss/three-column-w-image.scss index 3688a6537a..74052e83c5 100644 --- a/docroot/modules/humsci/hs_layouts/scss/three-column-w-image.scss +++ b/docroot/modules/humsci/hs_layouts/scss/three-column-w-image.scss @@ -4,9 +4,19 @@ // Page layout: Three column with image // -@import - 'decanter-no-markup', - '../../../../themes/humsci/su_humsci_theme/scss/utilities/mixins/index'; +@import "decanter-no-markup"; + +@mixin accent-dash($dash-height, $dash-color, $dash-width) { + &::before { + border-bottom: $dash-height solid $dash-color; + content: ""; + display: inline-block; + vertical-align: middle; + width: $dash-width; + + @include margin(null 10px null null); + } +} .three-column-w-image { .image-wrapper { diff --git a/docroot/modules/humsci/hs_layouts/src/Plugin/Layout/HumsciLayout.php b/docroot/modules/humsci/hs_layouts/src/Plugin/Layout/HumsciLayout.php index 73841972dd..37f0bcf781 100644 --- a/docroot/modules/humsci/hs_layouts/src/Plugin/Layout/HumsciLayout.php +++ b/docroot/modules/humsci/hs_layouts/src/Plugin/Layout/HumsciLayout.php @@ -9,7 +9,7 @@ /** * Class HumsciLayout. * - * @package Drupal\su_humsci_theme\Plugin + * @package Drupal\hs_layouts\Plugin */ class HumsciLayout extends LayoutDefault implements PluginFormInterface { diff --git a/docroot/modules/humsci/hs_layouts/src/TwigExtension/TwigFilters.php b/docroot/modules/humsci/hs_layouts/src/TwigExtension/TwigFilters.php index db526e94e8..be5a0a313a 100644 --- a/docroot/modules/humsci/hs_layouts/src/TwigExtension/TwigFilters.php +++ b/docroot/modules/humsci/hs_layouts/src/TwigExtension/TwigFilters.php @@ -8,7 +8,7 @@ /** * Additional twig filters for custom functionality. * - * @package Drupal\su_humsci_theme\TwigExtension + * @package Drupal\hs_layouts\TwigExtension */ class TwigFilters extends AbstractExtension { diff --git a/docroot/profiles/humsci/su_humsci_profile/su_humsci_profile.install b/docroot/profiles/humsci/su_humsci_profile/su_humsci_profile.install index fd151271b8..31d51e02e8 100644 --- a/docroot/profiles/humsci/su_humsci_profile/su_humsci_profile.install +++ b/docroot/profiles/humsci/su_humsci_profile/su_humsci_profile.install @@ -845,3 +845,21 @@ function _su_humsci_profile_get_uuid(string $config_name): string|null { $config = $config_storage->read($config_name); return $config['uuid'] ?? NULL; } + +/** +* Uninstall legacy themes. +*/ +function su_humsci_profile_update_9705() { + $installed_themes = \Drupal::service('extension.list.theme')->getAllInstalledInfo(); + $legacy_themes = [ + 'archaeology', + 'francestanford', + 'mathematics', + 'su_humsci_subtheme', + 'su_humsci_theme', + ]; + + // Get list of legacy themes to uninstall. + $themes_to_uninstall = array_intersect($legacy_themes, array_keys($installed_themes)); + \Drupal::service('theme_installer')->uninstall($themes_to_uninstall); +} diff --git a/docroot/themes/humsci/humsci_basic/docs/config-override-deployment.md b/docroot/themes/humsci/humsci_basic/docs/config-override-deployment.md index fe3306c85a..3d78f52a2c 100644 --- a/docroot/themes/humsci/humsci_basic/docs/config-override-deployment.md +++ b/docroot/themes/humsci/humsci_basic/docs/config-override-deployment.md @@ -1,14 +1,6 @@ # Deploying new components without impacting legacy and existing site configuration(s) -Stanford University Humanities & Sciences supports the creation of multiple websites. Sparkbox is assisting with the implementation of new themes to support updates to their client's sites. The themes that currently exist can be categorized as legacy and current. - -## Legacy site themes - -* SU_HUMSCI_THEME (base theme) - * Archaeology - * France-Stanford - * Mathematics - * Stanford HumSci SubTheme +Stanford University Humanities & Sciences supports the creation of multiple websites. Sparkbox is assisting with the implementation of new themes to support updates to their client's sites. ## Current site themes @@ -19,16 +11,13 @@ Stanford University Humanities & Sciences supports the creation of multiple webs ## Post Update functions -Post update functions allow us to override Humsci Basic theme settings. New components / paragraph type configurations and exisiting component configurations are available to all sites (legacy & current). When configurations are added or updated, we may not want those changes on all sites. - -Post update functions allow us to target and prevent new configurations from being available for use on legacy sites. We need to prevent new features from breaking the functionality and presentation of legacy sites. +Post update functions allow us to override Humsci Basic theme settings. New components / paragraph type configurations and exisiting component configurations are available to all sites. When configurations are added or updated, we may not want those changes on all sites. When you would like to add a new Post update function you will need to to update the file below: https://github.com/SU-HSDO/suhumsci/blob/develop/docroot/profiles/humsci/su_humsci_profile/su_humsci_profile.post_update.php -* You'll want to add a new function with the prefix `su_humsci_provile_post_update` to the function with a number assigned to the new function, example `su_humsci_profile_post_update_9013`. We assign a number that would be the next logical order to what has been added ex: 9012, 9013, 9014.. +* You'll want to add a new function with the prefix `su_humsci_profile_post_update` to the function with a number assigned to the new function, example `su_humsci_profile_post_update_9013`. We assign a number that would be the next logical order to what has been added ex: 9012, 9013, 9014.. * You will need to write the function to disable or enable the component depending on how which option you'd like to do. -* You will also need to add a line for legacy if your function needs to remove the component from legacy only or on both current and legacy themes. ### Example(s) @@ -38,20 +27,3 @@ _su_humsci_profile_enable_paragraph('node', 'hs_basic_page', 'field_hs_page_comp ``` * How you fill in the function: `('entity_type', 'entity_name', 'field_region_name', 'field_name')`. - -#### Legacy Example info - -Focusing specifically on the legacy themes only you can use an `if` statement for the legacy theme profile. - -```php -function su_humsci_profile_post_update_9011() { - if (_su_humsci_profile_is_legacy_theme()) { - _su_humsci_profile_disable_paragraph('paragraph', 'hs_row', 'field_hs_row_components', 'hs_timeline'); - return; - } - - _su_humsci_profile_enable_paragraph('paragraph', 'hs_row', 'field_hs_row_components', 'hs_timeline'); -} -``` - -* This function is filled out the same as the example above it, but it uses an `if` statement to disable the paragraph component for `hs_timeline` on Legacy themes only and enables it on the current themes.