Skip to content

Commit

Permalink
Merge branch 'master' into release-8.1.12
Browse files Browse the repository at this point in the history
  • Loading branch information
pookmish committed May 7, 2021
2 parents a3df741 + ae07b11 commit f9e14b8
Show file tree
Hide file tree
Showing 4 changed files with 59 additions and 138 deletions.
20 changes: 19 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# SOE Basic Sub-Theme

8.x-1.9
8.x-1.12
--------------------------------------------------------------------------------
_Release Date: 2021-05-07_

Expand All @@ -9,6 +9,24 @@ _Release Date: 2021-05-07_
- D8CORE-3950: adjusting Past Event list page h1 spacing (#74) (3a91ffc)
- Updated components definition in the info.yml (#73) (31fa3b7)

8.x-1.11
--------------------------------------------------------------------------------
_Release Date: 2021-03-05_

- D8CORE-3247: Publications styles (#66) (a487064)
- Update composer.json for stanford_basic (#65) (586fabc)
- D8CORE-3528: updating class name to match reality (#64) (a49c69d)
- D8CORE-3499: fixing the link icons (#61) (a3a1119)
- D8CORE-3246 D8CORE-3487: fixing the external link icons (#63) (414b076)
- D8CORE-3248: publication set up for SOE (#59) (af11eda)

8.x-1.10
--------------------------------------------------------------------------------
_Release Date: 2021-03-16_

- Hotfix for D8CORE-3499, style fixes for soe arrow and external links


8.x-1.8
--------------------------------------------------------------------------------
_Release Date: 2021-02-08_
Expand Down
2 changes: 1 addition & 1 deletion dist/css/theme.css

Large diffs are not rendered by default.

3 changes: 1 addition & 2 deletions soe_basic.info.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,8 @@ name: SOE Basic
type: theme
description: 'SOE Branding Subtheme.'
package: Stanford
version: 8.x-1.9
version: 8.x-1.12
core_version_requirement: ^9

# Defines the base theme
base theme: stanford_basic

Expand Down
172 changes: 38 additions & 134 deletions src/scss/theme/_publications.scss
Original file line number Diff line number Diff line change
Expand Up @@ -26,107 +26,59 @@
}

// More publications cards on the publication node page.
.stanford-publications-related {
.su-card__contents {
h2 {
> a:not(.su-link--external) {
@include soe--link;
@include soe-link-icon(soe_arrow, 1.8rem, 0);

display: inline;
font-weight: $su-font-bold;
margin: 0;
animation: none;

&::after {
background-color: $su-color-black;
color: $su-color-black;
transform: none;
}

&:hover,
&:focus {
@include soe--link-hover;
.su-card__contents {
h2 {
> a:not(.su-link--external) {
@include soe--link;
@include soe-link-icon(soe_arrow, 1.8rem, 0);

color: $su-color-black;
text-decoration: none;

&::after {
transform: none;
}
}
display: inline;
font-weight: $su-font-bold;
margin: 0;
animation: none;

&::after {
background-color: $su-color-black;
}
&::after {
background-color: $su-color-black;
color: $su-color-black;
transform: none;
}

> a {
&.su-link--external {
@include soe--link;
@include link-icon(arrow-up-right, 1.3rem, topright);

&::after {
background-color: $su-color-black;
}

&:hover,
&:focus {
@include soe--link-hover;
&:hover,
&:focus {
@include soe--link-hover;

color: $su-color-black;
text-decoration: none;
color: $su-color-black;
text-decoration: none;

&::after {
transform: none;
}
}
&::after {
transform: none;
}
}
}

// Topics list.
a {
@include small-paragraph;

border: 0;
color: $su-color-bright-red;
font-weight: $su-font-regular;
text-decoration: none;

&:hover,
&:focus {
border: 0;
color: $su-color-bright-red;
text-decoration: underline;
&::after {
background-color: $su-color-black;
}
}
}

.su-button--secondary {
@include responsive-spacing('margin-top', 0);
> a {
&.su-link--external {
@include soe--link;
@include link-icon(arrow-up-right, 1.3rem, topright);

display: inline-block;
border: 0;
font-weight: $su-font-regular;
&::after {
background-color: $su-color-black;
}

&:hover {
border: 0;
}
}
&:hover,
&:focus {
@include soe--link-hover;

&.views-block {
.more-link {
> a {
background-color: $soe-color-turquoise;
color: $soe-color-black;
font-weight: $su-font-regular;
border: 0;
color: $su-color-black;
text-decoration: none;

&:hover {
background-color: $su-color-black;
border: 0;
color: $su-color-white;
&::after {
transform: none;
}
}
}
}
Expand All @@ -137,9 +89,7 @@
// Publications list view
.stanford-publications {
&.view {

// Filtered results for link at top of filtered page.
a {
a:not([class*="button"]) {
@include soe--link;

display: inline;
Expand Down Expand Up @@ -191,53 +141,8 @@
}

}

// Removing the soe link style from the edit button
.views-field-edit-node {
.su-button--secondary {
@include responsive-spacing('margin-top', 0);

display: inline-block;
border: 0;
font-weight: $su-font-regular;

&:hover {
border: 0;
}
}
}
}

// Teaser
.ptype-stanford-entity {
.ds-entity--stanford-publication {
.su-card__contents {
> h2 {
a {
@include soe--link;
@include soe-link-icon(soe_arrow, 1.8rem, 0);

&::after {
background-color: $soe-color-black;
}

&:hover,
&:focus {
@include soe--link-hover;

text-decoration: none;

&::after {
transform: none;
}
}
}
}
}
}
}


// Filter list view
// Getting the banner aligned full width
.publications-terms--filtered {
Expand All @@ -254,4 +159,3 @@
}

}

0 comments on commit f9e14b8

Please sign in to comment.