Skip to content

Commit

Permalink
Merge pull request #187 from isubit/development
Browse files Browse the repository at this point in the history
Development - 1.7.3
  • Loading branch information
sacarney authored Dec 9, 2021
2 parents 9e4635f + 82f6127 commit cdbfe7a
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 23 deletions.
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
@@ -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"
}
4 changes: 2 additions & 2 deletions css/base.css
Original file line number Diff line number Diff line change
@@ -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.
*/
Expand Down Expand Up @@ -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;
Expand Down
36 changes: 18 additions & 18 deletions css/theme.css
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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
}
Expand Down Expand Up @@ -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;
}

Expand Down Expand Up @@ -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;
}
Expand All @@ -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;
Expand All @@ -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;
Expand Down Expand Up @@ -899,19 +899,19 @@ 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;
}

/* -------------------------------------- */
/* ## FORMS
/* -------------------------------------- */

.form-required:after { /* .form-required from Drupal 8 */
.form-required:after { /* .form-required from Drupal */
content: "*";
margin-left: 0.25rem;
color: #cc0000;
Expand All @@ -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;
}

Expand All @@ -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;
}

Expand Down Expand Up @@ -1020,7 +1020,7 @@ details {
border-color: #6c757d;
}

.text-summary-wrapper { /* class via Drupal 8 */
.text-summary-wrapper { /* class via Drupal */
margin-bottom: 1rem;
}

Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions iastate_theme.info.yml
Original file line number Diff line number Diff line change
@@ -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_version_requirement: ^8 || ^9
version: "1.7.2"
version: "1.7.3"
base theme: stable
libraries:
- iastate_theme/global-css
Expand Down

0 comments on commit cdbfe7a

Please sign in to comment.