Skip to content

Commit

Permalink
8.1.13
Browse files Browse the repository at this point in the history
  • Loading branch information
pookmish authored Jun 11, 2021
2 parents 46426a5 + b9234aa commit c4f93e1
Show file tree
Hide file tree
Showing 8 changed files with 131 additions and 63 deletions.
89 changes: 46 additions & 43 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -1,43 +1,46 @@
version: 2
# CircleCI integration with Drupal 8.

## Defines images and working directory.
defaults: &defaults
docker:
- image: pookmish/drupal8ci:pcov
- image: selenium/standalone-chrome:3.141.59-neon
- image: mariadb:10.3
environment:
MYSQL_ALLOW_EMPTY_PASSWORD: 1
working_directory: /var/www/html

#Jobs

back_to_dev: &back_to_dev
<<: *defaults
steps:
- checkout
- run:
name: Back to dev
command: |
composer global require SU-SWS/stanford-caravan:dev-8.x-1.x
~/.composer/vendor/bin/sws-caravan back-to-dev ${CIRCLE_TAG} ${CIRCLE_WORKING_DIRECTORY}
# Declare all of the jobs we should run.
jobs:
run-back-to-dev:
<<: *back_to_dev

# Declare a workflow that runs all of our jobs in parallel.
workflows:
version: 2
after_release:
jobs:
- run-back-to-dev:
filters:
tags:
only:
- /^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*).*?$/
branches:
ignore:
- /.*/
version: 2
# CircleCI integration with Drupal 8.

## Defines images and working directory.
defaults: &defaults
docker:
- image: pookmish/drupal8ci:latest
- image: selenium/standalone-chrome:latest
- image: circleci/mysql:5.7
environment:
MYSQL_DATABASE: drupal
MYSQL_USER: drupal
MYSQL_PASSWORD: drupal
MYSQL_ALLOW_EMPTY_PASSWORD: 1
working_directory: /var/www/html

#Jobs

back_to_dev: &back_to_dev
<<: *defaults
steps:
- checkout
- run:
name: Back to dev
command: |
composer global require SU-SWS/stanford-caravan:dev-8.x-1.x
~/.composer/vendor/bin/sws-caravan back-to-dev ${CIRCLE_TAG} ${CIRCLE_WORKING_DIRECTORY}
# Declare all of the jobs we should run.
jobs:
run-back-to-dev:
<<: *back_to_dev

# Declare a workflow that runs all of our jobs in parallel.
workflows:
version: 2
after_release:
jobs:
- run-back-to-dev:
filters:
tags:
only:
- /^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*).*?$/
branches:
ignore:
- /.*/
55 changes: 46 additions & 9 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# READY FOR REVIEW/NOT READY
# NOT READY FOR REVIEW
- (Edit the above to reflect status)

# Summary
Expand All @@ -7,23 +7,60 @@
# Review By (Date)
- When does this need to be reviewed by?

# Criticality
- How critical is this PR on a 1-10 scale? Also see [Severity Assessment](https://stanfordits.atlassian.net/browse/D8CORE-1705).
- E.g., it affects one site, or every site and product?

# Urgency
- How critical is this PR?
- How urgent is this? (Normal, High)

# Review Tasks

## Setup tasks and/or behavior to test

1. Check out this branch
2. Rebuild Cache and import config `drush cr ; drush ci`
3. Navigate to...
4. Verify...

### Site Configuration Sync

- Is there a config:export in this PR that changes the config sync directory?

## Front End Validation
- [ ] Design is approved by @ user?
- [ ] HTML validation: Is the markup using the appropriate semantic tags and [passes validation](https://validator.w3.org/nu/)? Or, [QA request ticket created](https://github.com/SU-SWS/template_warehouse/blob/master/jira_templates/QA_request_template.txt)?
- [ ] Cross-browser testing: Has been performed? Or, [QA request ticket created](https://github.com/SU-SWS/template_warehouse/blob/master/jira_templates/QA_request_template.txt)?
- [ ] Automated accessibility: Scans performed? Or, [QA request ticket created](https://github.com/SU-SWS/template_warehouse/blob/master/jira_templates/QA_request_template.txt)?
- [ ] Manual accessibility: Manually tested? Or, [QA request ticket created](https://github.com/SU-SWS/template_warehouse/blob/master/jira_templates/QA_request_template.txt)?

## Backend / Functional Validation
### Code
- [ ] Are the naming conventions following our standards?
- [ ] Does the code have sufficient inline comments?
- [ ] Is there anything in this code that would be hidden or hard to discover through the UI?
- [ ] Are there any [code smells](https://blog.codinghorror.com/code-smells/)?
- [ ] Are tests provided? eg (unit, behat, or codeception)

# Steps to Test
### Code security
- [ ] Are all [forms properly sanitized](https://www.drupal.org/docs/8/security/drupal-8-sanitizing-output)?
- [ ] Any obvious [security flaws or new areas for attack](https://www.drupal.org/docs/8/security)?

1. Do this
1. Then this
2. Then this
## General
- [ ] Is there anything included in this PR that is not related to the problem it is trying to solve?
- [ ] Is the approach to the problem appropriate?

# Affected Projects or Products
- Does this PR impact any particular projects, products, or modules?

# Associated Issues and/or People
- JIRA ticket
- JIRA ticket(s)
- Other PRs
- Any other contextual information that might be helpful (e.g., description of a bug that this PR fixes, new functionality that it adds, etc.)
- Anyone who should be notified? (`@mention` them here)

# See Also
- [PR Checklist](https://gist.github.com/sherakama/0ba17601381e3adbe0cad566ad4d80a5)
# Resources
- [AMP Tool](https://stanford.levelaccess.net/index.php)
- [Accessibility Manual Test Script](https://docs.google.com/document/d/1ZXJ9RIUNXsS674ow9j3qJ2g1OAkCjmqMXl0Gs8XHEPQ/edit?usp=sharing)
- [HTML Validator](https://validator.w3.org/)
- [Browserstack](https://live.browserstack.com/dashboard) and link to [Browserstack Credentials](https://asconfluence.stanford.edu/confluence/display/SWS/External+Account+Credentials)
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# SOE Basic Sub-Theme

8.x-1.13
--------------------------------------------------------------------------------
_Release Date: 2021-06-11_

- D8CORE-4090: Subtheme updates for news after the refactor (#78) (795a546)
- Added theme suggestion alter for search block (0eef723)

8.x-1.12
--------------------------------------------------------------------------------
_Release Date: 2021-05-07_
Expand All @@ -26,6 +33,7 @@ _Release Date: 2021-03-16_

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

>>>>>>> master
8.x-1.8
--------------------------------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@
"license": "GPL-2.0+",
"minimum-stability": "dev",
"require": {
"su-sws/stanford_basic": "^8.5.0"
"su-sws/stanford_basic": "^8.5"
}
}
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.12
version: 8.x-1.13
core_version_requirement: ^9
# Defines the base theme
base theme: stanford_basic
Expand Down
9 changes: 9 additions & 0 deletions soe_basic.theme
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,15 @@ function soe_basic_preprocess_html(&$variables) {
$variables['stanford_basic_path'] = drupal_get_path('theme', 'stanford_basic');
}

/**
* Implements hook_theme_suggestions_HOOK_alter().
*/
function soe_basic_theme_suggestions_block_alter(array &$suggestions, array $variables) {
if (!empty($variables['elements']['#id']) && $variables['elements']['#id'] == 'soe_basic_search') {
$suggestions[] = 'block__stanford_basic_search';
}
}

/**
* Implements hook_preprocess_HOOK().
*/
Expand Down
27 changes: 19 additions & 8 deletions src/scss/theme/_news.scss
Original file line number Diff line number Diff line change
@@ -1,28 +1,38 @@
@charset 'UTF-8';

// News List
.stanford-news--list {
.su-news-list {
.su-news-list__item {
.su-news-list {
.su-news-article {

a {
h2 {
font-weight: $su-font-black;
}

a {
@include soe--link;

color: $su-color-black;

&:focus,
&:active,
&:hover {
@include soe--link-hover;
text-decoration: none;
}
}

&::after {
background-color: $su-color-black;
&:focus,
&:active,
&:hover {
text-decoration: none;

h2 {
@include soe--link-hover;
}

}

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

.su-news-list__item__date {
Expand All @@ -37,6 +47,7 @@
}
}


// Load more button.
.js-pager__items {
.pager__item {
Expand Down

0 comments on commit c4f93e1

Please sign in to comment.