Skip to content

Commit

Permalink
Merge branch '2.x' into CHEMH-83--news-node
Browse files Browse the repository at this point in the history
  • Loading branch information
jdwjdwjdw authored Sep 22, 2023
2 parents 357caa0 + 67c2d8c commit a4f997e
Show file tree
Hide file tree
Showing 6 changed files with 62 additions and 74 deletions.
2 changes: 1 addition & 1 deletion dist/css/chem_h_subtheme.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"bourbon": "^5.1",
"browserslist": "^4.8.7",
"css-loader": "^2.1",
"decanter": "^6.2.7",
"decanter": "^6.2.19",
"drupal-behaviors-loader": "^1.0",
"element-closest-polyfill": "^1.0.0",
"element-matches-polyfill": "^1.0.0",
Expand Down
2 changes: 1 addition & 1 deletion src/js/chem_h_subtheme.behaviors.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
$('.su-quote__bio', context).append($('.su-person-profile-link', context).detach());

// Square image for Person lists
$('.stanford-people-grid img').each(function () {
$('.stanford-people-grid img, .taxonomy-term-pages.people-terms img').each(function () {
const newImgSrc = $(this).attr('src').replace(/styles\/.*\/public/g, 'styles/large_square/public');
$(this).attr('src', newImgSrc)
.removeAttr('height')
Expand Down
7 changes: 5 additions & 2 deletions src/scss/components/person/_person-lists.scss
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
@charset "UTF-8";

// Person lists
.stanford-people-grid {
.stanford-people-grid,
.taxonomy-term-pages.people-terms {
li {
background-color: #2e2d29;
padding-left: 3.6rem;
Expand Down Expand Up @@ -50,9 +51,11 @@
}
}

h2 {
h2,
h3 {
letter-spacing: -.016em;
color: $su-color-white;
line-height: 1.4;
}
}

Expand Down
120 changes: 54 additions & 66 deletions src/scss/components/person/_person-teasers.scss
Original file line number Diff line number Diff line change
@@ -1,85 +1,73 @@
@charset "UTF-8";

// Person teasers
.paragraph--type--stanford-entity {
.su-entity-item {
padding-top: 2rem;
.ds-entity--stanford-person {
.su-card {
container-type: inline-size;
background-color: $su-color-black;
margin-top: 2rem;
border: none;

.su-card {
container-type: inline-size;
background-color: $su-color-black;
margin-top: 2rem;
border: none;

.su-person-photo {
padding: 0 3.6rem 1rem 3.6rem;
}

@container (min-width: 400px) {
.su-person-photo {
padding: 0 3.6rem 1rem 3.6rem;
padding-left: 0;
padding-right: 0;
}
}

@container (min-width: 400px) {
.su-person-photo {
padding-left: 0;
padding-right: 0;
}
.field-media-image {
position: relative;
bottom: 2rem;

&::after {
@include chemh-news-card--gradient;

content: '';
height: 0.25em;
display: block;
}

.field-media-image {
position: relative;
bottom: 2rem;

&::after {
@include chemh-news-card--gradient;

content: '';
height: 0.25em;
display: block;
}

img {
border-radius: 0;
border-top-right-radius: 40px;
}
img {
border-radius: 0;
border-top-right-radius: 40px;
}

.su-card__contents {
text-align: start;
padding-top: 0;
padding-bottom: 5rem;

h2 {
margin-bottom: 0.5rem;

a {
font-size: 0.8em;
color: $su-color-white;
}
}

.su-person-short-title {
}

.su-card__contents {
text-align: start;
padding-top: 0;
padding-bottom: 5rem;

h2 {
margin-bottom: 0.5rem;

a {
font-size: 0.8em;
color: $su-color-white;
font-style: italic;
font-weight: 300;
}
}

.su-person-short-title {
color: $su-color-white;
font-style: italic;
font-weight: 300;
}
}
}
}

// One teaser
@include grid-media-min('sm') {
.su-entity-item>div:first-child:last-child .ds-entity--stanford-person .su-card {
.su-person-photo {
padding: 0;

.field-media-image {
bottom: 0;
}
}

.su-card__contents {
bottom: 0;
padding-top: unset;
padding-bottom: unset;
}
// Individual teaser in one column layout
@include grid-media-min('sm') {
.layout--layout-paragraphs-one-column .paragraph--type--stanford-entity .su-entity-item>div:first-child:last-child .ds-entity--stanford-person .su-card {
display: block;

.su-person-photo {
width: unset;
margin: 0 auto;
}
}
}
3 changes: 0 additions & 3 deletions src/scss/theme/_headings.scss
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
@charset "UTF-8";

// Headings
h1, h2, h3, h4, h5 {
font-family: 'Source Sans Pro';
}

h1 {
font-weight: $su-font-black;
Expand Down

0 comments on commit a4f997e

Please sign in to comment.