Skip to content
This repository has been archived by the owner on Aug 8, 2023. It is now read-only.

Commit

Permalink
8.5.13
Browse files Browse the repository at this point in the history
- D8CORE-4234: change to how the onEsc.js works (#257)
- D8CORE-4246 Inherit font family when using font awesome classes (#256)
- Added core patch and some readme documentation (#255)
  • Loading branch information
pookmish authored Nov 19, 2021
2 parents aa889a9 + 841ef41 commit 4e4b970
Show file tree
Hide file tree
Showing 10 changed files with 66 additions and 21 deletions.
9 changes: 9 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,15 @@
# Stanford Basic Theme


8.x-5.13
--------------------------------------------------------------------------------
_Release Date: 2021-11-19_

- D8CORE-4234: change to how the onEsc.js works (#257)
- D8CORE-4246 Inherit font family when using font awesome classes (#256)
- Added core patch and some readme documentation (#255)


8.x-5.12
--------------------------------------------------------------------------------
_Release Date: 2021-11-04_
Expand Down
38 changes: 23 additions & 15 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,22 @@ Stanford Basic is a Stanford Branded Drupal 8 base theme that integrates with th
Accessibility
---
[![WCAG Conformance 2.0 AA Badge](https://www.w3.org/WAI/wcag2AA-blue.png)](https://www.w3.org/TR/WCAG20/)
Evaluation Date: 2020-02-05
Evaluation Date: 2020-02-05
This theme conforms to level AA WCAG 2.0 standards as required by the university's accessibility policy. For more information on the policy please visit: [https://ucomm.stanford.edu/policies/accessibility-policy.html](https://ucomm.stanford.edu/policies/accessibility-policy.html).

Installation
---

Install this theme like any other theme. [See Drupal Documentation](https://www.drupal.org/docs/8/extending-drupal-8/installing-themes)

This theme depends on the [`Components`](https://www.drupal.org/project/components) module to register template
namespaces. If downloading this theme via composer, the module is already downloaded and simply needs to be enabled
before the theme can be enabled.

If using this theme in conjunction with configuration management and doing site install, a patch is included in the
composer.json. Ensure that your project's root composer.json has [patching enabled](https://github.com/cweagans/composer-patches#allowing-patches-to-be-applied-from-dependencies)
or download and patch Drupal Core manually.

Configuration
---

Expand Down Expand Up @@ -61,17 +69,17 @@ Contribution / Collaboration
You are welcome to contribute functionality, bug fixes, or documentation to this theme. If you would like to suggest a fix or new functionality you may add a new issue to the GitHub issue queue or you may fork this repository and submit a pull request. For more help please see [GitHub's article on fork, branch, and pull requests](https://help.github.com/articles/using-pull-requests)


Releases
---

Steps to build a new release:
- Checkout the latest commit from the `8.x-4.x` branch.
- Create a new branch for the release.
- Commit any necessary changes to the release branch.
- These may include, but are not necessarily limited to:
- Update the version in any `info.yml` files, including in any submodules.
- Update the CHANGELOG to reflect the changes made in the new release.
- Make a PR to merge your release branch into `master`
- Give the PR a semver-compliant label, e.g., (`patch`, `minor`, `major`). This may happen automatically via Github actions (if a labeler action is configured).
- When the PR is merged to `master`, a new tag will be created automatically, bumping the version by the semver label.
- The github action is built from: [semver-release-action](https://github.com/K-Phoen/semver-release-action), and further documentation is available there.
Releases
---

Steps to build a new release:
- Checkout the latest commit from the `8.x-4.x` branch.
- Create a new branch for the release.
- Commit any necessary changes to the release branch.
- These may include, but are not necessarily limited to:
- Update the version in any `info.yml` files, including in any submodules.
- Update the CHANGELOG to reflect the changes made in the new release.
- Make a PR to merge your release branch into `master`
- Give the PR a semver-compliant label, e.g., (`patch`, `minor`, `major`). This may happen automatically via Github actions (if a labeler action is configured).
- When the PR is merged to `master`, a new tag will be created automatically, bumping the version by the semver label.
- The github action is built from: [semver-release-action](https://github.com/K-Phoen/semver-release-action), and further documentation is available there.
7 changes: 7 additions & 0 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,12 @@
"require": {
"drupal/core": "^9.0",
"drupal/components": "^2.0"
},
"extra": {
"patches": {
"drupal/core": {
"https://www.drupal.org/project/drupal/issues/3176625": "https://www.drupal.org/files/issues/2021-05-18/fix_ConfigImportSubscriber_validateThemes-3176625-29.patch"
}
}
}
}
2 changes: 1 addition & 1 deletion dist/css/base.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/css/ckeditor.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/js/base.js

Large diffs are not rendered by default.

5 changes: 4 additions & 1 deletion src/js/components/multi-menu/buttons/MultiSubNavButtons.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ import OnArrowRightLV1 from './events/OnArrowRightLV1';
import OnArrowDownToggleLV1 from './events/OnArrowDownToggleLV1';
import OnClickToggleLV1 from './events/OnClickToggleLV1';
import OnArrowUpToggleLV1 from './events/OnArrowUpToggleLV1';
import OnEsc from '../../secondary-nav/common/events/OnEsc.js';


/**
* SecondarySubNavAccordion Class
Expand Down Expand Up @@ -48,7 +50,8 @@ export default class MultiSubNavButtons extends SecondarySubNavButtons {
onKeydownArrowRight: OnArrowRightToggleLV1,
onKeydownArrowDown: OnArrowDownToggleLV1,
onKeydownArrowUp: OnArrowUpToggleLV1,
onClick: OnClickToggleLV1
onClick: OnClickToggleLV1,
onKeydownEscape: OnEsc
};
}

Expand Down
3 changes: 2 additions & 1 deletion src/js/components/secondary-nav/common/events/OnEsc.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,12 @@ export default class OnEsc extends EventAbstract {
this.event.preventDefault();
let node = false;

if (this.item.getDepth() > 1) {
if (this.parentNav.getDepth() > 2) {
this.event.stopPropagation();
this.parentNav.closeSubNav();
node = this.getElement('parentItem').parentElement.getElementsByTagName('button')[0];
}

else {
if (this.isDesktop()) {
this.masterNav.closeAllSubNavs();
Expand Down
17 changes: 17 additions & 0 deletions src/scss/base/_typography.scss
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,20 @@
* See: https://github.com/SU-SWS/decanter/blob/master/core/src/scss/elements/typography/_typography.scss
* See: node_modules/decanter/core/src/scss/elements/typography/_typography.scss
*/

// Restore font style when using font awesome icons on an element.
p,
div {
&.fab,
&.fad,
&.fal,
&.far,
&.fas {
font-family: inherit;
font-weight: inherit;

&:before {
font-family: "Font Awesome 5 Brands";
}
}
}
2 changes: 1 addition & 1 deletion stanford_basic.info.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: 'Stanford Basic'
type: theme
description: 'Stanford Basic Branding Theme.'
package: Stanford
version: 8.x-5.12
version: 8.x-5.13
core_version_requirement: ^9
dependencies:
- components:components
Expand Down

0 comments on commit 4e4b970

Please sign in to comment.