From b785769948a1ca77dcb1318ae6f6e91ffc0ab6b1 Mon Sep 17 00:00:00 2001 From: sacarney Date: Tue, 2 Nov 2021 10:08:33 -0500 Subject: [PATCH 1/5] Update iastate_theme.info.yml --- iastate_theme.info.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/iastate_theme.info.yml b/iastate_theme.info.yml index 624c5ec..6a55ec1 100644 --- a/iastate_theme.info.yml +++ b/iastate_theme.info.yml @@ -3,7 +3,7 @@ description: Drupal 8 theme for Iowa State University websites type: theme core: 8.x core_version_requirement: ^8 || ^9 -version: "1.7.1" +version: "1.7.2" base theme: stable libraries: - iastate_theme/global-css From 421be9060df322a401f5d14584ae5d352978cbf5 Mon Sep 17 00:00:00 2001 From: sacarney Date: Mon, 6 Dec 2021 13:15:37 -0600 Subject: [PATCH 2/5] D8ISUTHEME-171 Start using Drupal 9, update version number --- iastate_theme.info.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/iastate_theme.info.yml b/iastate_theme.info.yml index 6a55ec1..76cc884 100644 --- a/iastate_theme.info.yml +++ b/iastate_theme.info.yml @@ -1,9 +1,9 @@ name: IASTATE Theme -description: Drupal 8 theme for Iowa State University websites +description: Drupal 9 theme for Iowa State University websites type: theme -core: 8.x +core: 9.x core_version_requirement: ^8 || ^9 -version: "1.7.2" +version: "1.7.3" base theme: stable libraries: - iastate_theme/global-css From 5f217b7da4cca5657bd6e227e78d66e1529e6917 Mon Sep 17 00:00:00 2001 From: sacarney Date: Mon, 6 Dec 2021 13:24:32 -0600 Subject: [PATCH 3/5] D8ISUTHEME-171 Do not change core --- iastate_theme.info.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/iastate_theme.info.yml b/iastate_theme.info.yml index 76cc884..f4df7e4 100644 --- a/iastate_theme.info.yml +++ b/iastate_theme.info.yml @@ -1,7 +1,7 @@ name: IASTATE Theme description: Drupal 9 theme for Iowa State University websites type: theme -core: 9.x +core: 8.x core_version_requirement: ^8 || ^9 version: "1.7.3" base theme: stable From 1a974d06c604ec75abe915a9aca96a02aaa00257 Mon Sep 17 00:00:00 2001 From: sacarney Date: Wed, 8 Dec 2021 15:22:04 -0600 Subject: [PATCH 4/5] Update composer.json --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 44fa76e..c472763 100644 --- a/composer.json +++ b/composer.json @@ -1,5 +1,5 @@ { "name": "isubit/iastate_theme", "type": "drupal-theme", - "description": "Drupal 8 theme for Iowa State University websites" + "description": "Drupal 9 theme for Iowa State University websites" } From d71ddec2f9565eb9865007b41508601d1e495b16 Mon Sep 17 00:00:00 2001 From: sacarney Date: Wed, 8 Dec 2021 15:22:22 -0600 Subject: [PATCH 5/5] D8ISUTHEME-171 remove references to D8 in CSS files --- css/base.css | 4 ++-- css/theme.css | 36 ++++++++++++++++++------------------ 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/css/base.css b/css/base.css index 442207b..18b5669 100644 --- a/css/base.css +++ b/css/base.css @@ -1,7 +1,7 @@ /** * @file * Base CSS styles for the ISU theme, primarily for directly overriding - * styles from Drupal 8 core or Bootstrap 4, including replacing some + * styles from Drupal core or Bootstrap 4, including replacing some * Bootstrap 4 colors with ISU brand colors, and tweaking colors to meet * WCAG AA color contrast guidelines. */ @@ -267,7 +267,7 @@ img { table img { max-width: none; /* Prevents images from shrinking in tables */ } -.caption-img figcaption { /* Class from Drupal 8. */ +.caption-img figcaption { /* Class from Drupal. */ /* Same as table caption. */ padding: 0.5rem; color: #333333; diff --git a/css/theme.css b/css/theme.css index 1e2298a..5287652 100644 --- a/css/theme.css +++ b/css/theme.css @@ -413,7 +413,7 @@ body, /* --- ## Site Links Menu --- */ /* * Markup found in menu--site-links.html.twig - * Show/hide/rearrange menu in Drupal 8 Structure > Menus. + * Show/hide/rearrange menu in Structure > Menus. */ .isu-sitelinks { @@ -650,7 +650,7 @@ body, text-decoration: none; } /* The Full Pager uses .active for the current page */ -.page-item.active .isu-page-link { /* .page-item via Drupal 8 */ +.page-item.active .isu-page-link { /* .page-item via Drupal */ background-color: #cc0000; border-color: #cc0000 } @@ -680,7 +680,7 @@ article:not(.isu-user):not(.isu-search_collapse) { font-size: 2rem; } -.node-form .isu-page-title .placeholder { /* placeholder class via Drupal 8 */ +.node-form .isu-page-title .placeholder { /* placeholder class via Drupal */ font-weight: bold; } @@ -821,20 +821,20 @@ article:not(.isu-user):not(.isu-search_collapse) { /* --- ## Links --- */ /* * Not, like, regular links, but the buttons that do stuff - * generated by Drupal 8 + * generated by Drupal */ .isu-links { margin-top: 1rem; margin-bottom: 0; } -.isu-links .comment-forbidden { /* .comment-forbidden via Drupal 8 */ +.isu-links .comment-forbidden { /* .comment-forbidden via Drupal */ margin-top: 1rem; } -.isu-links.contextual-links li { /* .contextual-links via Drupal 8 */ +.isu-links.contextual-links li { /* .contextual-links via Drupal */ display: block; } -.action-links { /* .action-links via Drupal 8 */ +.action-links { /* .action-links via Drupal */ list-style-type: none; padding-left: 0; } @@ -849,7 +849,7 @@ div[id$="local-actions"] nav { * Mimics Bootstrap 4 .alert.alert-warning */ -.tabledrag-changed-warning { /* Class via Drupal 8 */ +.tabledrag-changed-warning { /* Class via Drupal */ padding: 0.75rem 1.25rem; margin-bottom: 1rem; border: 1px solid transparent; @@ -860,7 +860,7 @@ div[id$="local-actions"] nav { border-color: #ffeeba; } -abbr[title].tabledrag-changed { /* Class via Drupal 8 */ +abbr[title].tabledrag-changed { /* Class via Drupal */ padding: 0.25rem; border: 1px solid transparent; border-radius: .25rem; @@ -899,11 +899,11 @@ abbr[title].tabledrag-changed { /* Class via Drupal 8 */ font-size: 0.85rem; } .indented { - /* .indented via Drupal 8. Used to nest comments and forum boards. */ + /* .indented via Drupal. Used to nest comments and forum boards. */ margin-left: 4rem; } .field--name-comment-body .isu-form-group { - /* .field--name-comment-body via Drupal 8 */ + /* .field--name-comment-body via Drupal */ margin-bottom: 0; } @@ -911,7 +911,7 @@ abbr[title].tabledrag-changed { /* Class via Drupal 8 */ /* ## FORMS /* -------------------------------------- */ -.form-required:after { /* .form-required from Drupal 8 */ +.form-required:after { /* .form-required from Drupal */ content: "*"; margin-left: 0.25rem; color: #cc0000; @@ -932,7 +932,7 @@ details { width: auto; max-width: 100%; } -.isu-form-control.error { /* .error via Drupal 8 */ +.isu-form-control.error { /* .error via Drupal */ border: 1px solid #cc0000; } @@ -952,7 +952,7 @@ details { .isu-form-type_date label, .isu-form-type_number label, .field--type-datetime label { - /* .filter-wrapper via Drupal 8 */ + /* .filter-wrapper via Drupal */ font-weight: 700; } @@ -1020,7 +1020,7 @@ details { border-color: #6c757d; } -.text-summary-wrapper { /* class via Drupal 8 */ +.text-summary-wrapper { /* class via Drupal */ margin-bottom: 1rem; } @@ -1053,7 +1053,7 @@ details { } /* --- ## Text fields with text format filter --- */ -/* .js-text-format-wrapper and .filter-wrapper via Drupal 8 */ +/* .js-text-format-wrapper and .filter-wrapper via Drupal */ .js-text-format-wrapper .isu-form-group.isu-form-type_textarea { margin-bottom: 0; @@ -1179,7 +1179,7 @@ details { /* --- ## Dropbutton Widget --- */ /* * Powerful CSS to manually style the dropbuttons. - * All classes via Drupal 8 + * All classes via Drupal */ .form-actions:after { @@ -1573,7 +1573,7 @@ img:not(.isu-wordmark-logo_default):not(.isu-wordmark-logo_custom):not(.isu-foot .isu-block_help p:last-of-type { margin-bottom: 0 } -.container-inline { /* class via Drupal 8 */ +.container-inline { /* class via Drupal */ display: flex; align-items: flex-end; flex-wrap: wrap;