Skip to content

Commit

Permalink
Merge pull request #38 from SU-SOE/release-8.1.2
Browse files Browse the repository at this point in the history
  • Loading branch information
imonroe authored Oct 5, 2020
2 parents 606a16f + 63264f4 commit 55064ee
Show file tree
Hide file tree
Showing 11 changed files with 106 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .sass-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ rules:
nesting-depth:
- 1
-
max-depth: 4
max-depth: 5
no-color-literals: 0
no-css-comments: 0
no-empty-rulesets: 1
Expand Down
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
# SOE Basic Sub-Theme

8.x-1.2
--------------------------------------------------------------------------------
_Release Date: 2020-10-05_

- D8CORE-2690: fixing colors for the person node page (#37) (ac58e31)
- D8CORE-2618: adding underline for hover (#35) (abdac1e)
- D8CORE-2653: drop shadow on load more button (#36) (e3af6f4)

8.x-1.1
--------------------------------------------------------------------------------
_Release Date: 2020-09-14_
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# [SOE Basic Theme](https://github.com/SU-SOE/soe_basic)
##### Version: 8.x-1.0-dev
##### Version: 8.x-1.x

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

Expand Down
2 changes: 1 addition & 1 deletion dist/css/theme.css

Large diffs are not rendered by default.

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

# Defines the base theme
Expand Down
7 changes: 7 additions & 0 deletions src/scss/theme/_button.scss
Original file line number Diff line number Diff line change
Expand Up @@ -36,5 +36,12 @@
}
}

// Back to all events or news link.
.more-link {
a {
@include box-shadow('shallow');
}
}



2 changes: 2 additions & 0 deletions src/scss/theme/_events.scss
Original file line number Diff line number Diff line change
Expand Up @@ -215,6 +215,8 @@
.js-pager__items {
.pager__item {
.button {
@include box-shadow('shallow');

background-color: $soe-color-turquoise;
color: $soe-color-black;

Expand Down
5 changes: 5 additions & 0 deletions src/scss/theme/_image-cta.scss
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,11 @@
// Text and arrow changes to white.
a {
color: $su-color-white;

&:hover,
&:focus {
text-decoration: underline;
}
}

.su-image-cta-paragraph__link {
Expand Down
2 changes: 2 additions & 0 deletions src/scss/theme/_news.scss
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,8 @@
.js-pager__items {
.pager__item {
.button {
@include box-shadow('shallow');

background-color: $soe-color-turquoise;
color: $soe-color-black;

Expand Down
76 changes: 75 additions & 1 deletion src/scss/theme/_people.scss
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ div[class^='stanford-people-grid'] {
.js-pager__items {
.pager__item {
.button {
@include box-shadow('shallow');

background-color: $soe-color-turquoise;
color: $soe-color-black;

Expand Down Expand Up @@ -52,6 +54,7 @@ div[class^='stanford-people-grid'] {

.content {
.right-region {
.node-stanford-person-su-person-contact,
.node-stanford-person-su-person-telephone,
.node-stanford-person-su-person-location-name,
.node-stanford-person-su-person-links {
Expand All @@ -61,6 +64,26 @@ div[class^='stanford-people-grid'] {
}
}
}

.node-stanford-person-su-person-links {
.su-person-links {
a {
&:hover,
&:focus {
color: $soe-color-black;
text-decoration: underline;

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

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

.su-person-content {
Expand All @@ -70,13 +93,65 @@ div[class^='stanford-people-grid'] {
color: $soe-color-orange;
}

.su-button {
color: $su-color-black;

&:hover {
color: $su-color-white;
}
}

.su-card {
color: $su-color-black;

.su-card__button {
color: $soe-color-black;

&:hover {
color: $su-color-white;
}
}

.su-button {
color: $soe-color-black;
text-decoration: none;

&:hover {
color: $su-color-white;
text-decoration: underline;
}
}

a {
color: $su-color-bright-red;
text-decoration: underline;

&:hover {
color: $su-color-black;
}

&.su-link--action {
text-decoration: none;

&:hover {
text-decoration: underline;
}
}
}
}

.layout--section-person-header {
color: $su-color-white;
}

.su-person-affiliations {
a {
background-color: $soe-color-pink;
color: $soe-color-black;

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

Expand All @@ -89,7 +164,6 @@ div[class^='stanford-people-grid'] {
}

.su-person-profile-link {
text-align: center;

a {
background-color: $soe-color-turquoise;
Expand Down
3 changes: 3 additions & 0 deletions src/scss/utilities/mixins/_buttons.scss
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,17 @@
@mixin soe-button--turquoise {
@include soe-button-common;
background-color: $soe-color-turquoise;
color: $soe-color-black;
}

@mixin soe-button--pink {
@include soe-button-common;
background-color: $soe-color-pink;
color: $soe-color-black;
}

@mixin soe-button--orange {
@include soe-button-common;
background-color: $soe-color-orange;
color: $soe-color-black;
}

0 comments on commit 55064ee

Please sign in to comment.