Skip to content

Commit

Permalink
Add v5.2 fixups (#91)
Browse files Browse the repository at this point in the history
* Add v5.2 fixups

* Update person and events cards

* Remove commented out code

* Adjust js
  • Loading branch information
jdwjdwjdw authored Mar 26, 2024
1 parent c12f27c commit 9b8c491
Show file tree
Hide file tree
Showing 11 changed files with 28 additions and 17 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# [ChEM-H Subtheme](https://github.com/SU-SWS/chem_h_subtheme)
##### Version: 2.2.7
##### Version: 2.2.8

Changelog: [Changelog.txt](CHANGELOG.txt)

Expand Down
2 changes: 1 addition & 1 deletion chem_h_subtheme.info.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: ChEM-H Subtheme
type: theme
description: 'ChEM-H Subtheme.'
package: Stanford
version: 2.2.7
version: 2.2.8
core_version_requirement: ^9 || ^10
base theme: stanford_basic
libraries:
Expand Down
2 changes: 1 addition & 1 deletion dist/css/chem_h_subtheme.css

Large diffs are not rendered by default.

6 changes: 5 additions & 1 deletion src/js/chem_h_subtheme.behaviors.js
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,11 @@
});

// Heading change for the halfpill title banner.
$('.chemh-wrapper--banner-halfpill-title h2').contents().unwrap().wrap('<h1/>');
const halfpillBannerHeadings = $('.chemh-wrapper--banner-halfpill-title h2, .chemh-wrapper--banner-halfpill-title h3, .chemh-wrapper--banner-halfpill-title h4, .chemh-wrapper--banner-halfpill-title .su-font-splash');

$(halfpillBannerHeadings).each(function(index, element) {
$(this).contents().unwrap().wrap('<h1/>');
});

// Bckground color needed on only the Halfpill title banner.
$('.chemh-wrapper--banner-halfpill-title').parents().find('.su-page-banner').addClass('su-page-banner--title');
Expand Down
9 changes: 7 additions & 2 deletions src/scss/components/banner/_banner--fullpill.scss
Original file line number Diff line number Diff line change
Expand Up @@ -98,11 +98,16 @@ $banner-circle--sm-image-width: 150px;
}

.su-card__contents {

h2 {
@include type-a;
}

h2,
h3,
h4,
.su-font-splash {
@include responsive-spacing('margin-bottom', -1);
@include chemh-heading--badge;
@include type-a;

color: $su-color-white;
font-family: $su-font-sans;
Expand Down
3 changes: 2 additions & 1 deletion src/scss/components/events/_event-card.scss
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,8 @@
}
}

h2 {
h2,
h3 {
a {
&:hover,
&:focus,
Expand Down
4 changes: 2 additions & 2 deletions src/scss/components/person/_person-teasers.scss
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,11 @@
padding-top: 0;
padding-bottom: 5rem;

h2 {
h2,
h3 {
margin-bottom: 0.5rem;

a {
font-size: 0.8em;
color: $su-color-white;
}
}
Expand Down
3 changes: 0 additions & 3 deletions src/scss/theme/_headings.scss
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ h2 {
h3 {
@include type-b;
font-weight: $su-font-bold;
line-height: 5.2rem;
/* identical to box height, or 149% */
letter-spacing: -1.5px;
color: $chemh-color-true-black;
Expand All @@ -31,7 +30,6 @@ h3 {
h4 {
@include type-c;
font-weight: $su-font-bold;
line-height: 3.8rem;
/* identical to box height, or 136% */
letter-spacing: -1px;
color: $chemh-color-true-black;
Expand All @@ -40,7 +38,6 @@ h4 {
h5 {
@include type-c;
font-weight: $su-font-bold;
line-height: 3.8rem;
/* identical to box height, or 136% */
letter-spacing: -1px;
color: $chemh-color-true-black;
Expand Down
6 changes: 4 additions & 2 deletions src/scss/theme/_links.scss
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,8 @@ a {
background-color: $chemh-color-digital-blue;
}

h2 {
h2,
h3 {
color: $chemh-color-digital-blue;
}
}
Expand All @@ -155,7 +156,8 @@ a {
&:focus {
color: $chemh-color-digital-blue;

h2 {
h2,
h3 {
color: $chemh-color-digital-blue;
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
{%- set link_attributes = link_attributes.addClass('su-link--external') -%}
{%- endif %}
{%- endif -%}
{% set header_tag = variant == 'h3_header' ? 'h3' : 'h2' %}

<div {{ attributes }}>
<div class="su-event-list-item__date">
Expand Down Expand Up @@ -67,7 +68,7 @@
{%- if url|render_clean is empty -%}
{{- headline -}}
{%- else -%}
<h2><a {{ link_attributes }} href="{{ url|render_clean }}">{{ headline|render_clean }}</a></h2>
<{{ header_tag }}<a {{ link_attributes }} href="{{ url|render_clean }}">{{ headline|render_clean }}</a><{{ header_tag }}
{%- endif -%}

{# Event Subheadline #}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
{%- endif -%}

{% set news_url = news_url|render|striptags("<drupal-render-placeholder>")|trim %}
{% set header_tag = variant == 'h3_header' ? 'h3' : 'h2' %}

<article{{ attributes.addClass(classes) }}>
{%- if news_url is not empty -%}
Expand All @@ -59,9 +60,9 @@
{%- if news_url is not empty -%}
<a {{ news_url_attributes.addClass('su-news-vertical-teaser__link') }} href="{{ news_url }}">
{%- endif -%}
<h2 class="su-link su-card__link">
<{{ header_tag }} class="su-link su-card__link">
{{- news_vertical_teaser_headline -}}
</h2>
</{{ header_tag }}>
{%- if news_url is not empty -%}
</a>
{%- endif -%}
Expand Down

0 comments on commit 9b8c491

Please sign in to comment.