Skip to content

Commit

Permalink
Merge branch 'master' into dependabot/npm_and_yarn/loader-utils-1.4.2
Browse files Browse the repository at this point in the history
  • Loading branch information
eebbi authored Jun 6, 2024
2 parents d19ce41 + b2cfc58 commit b97d3e2
Show file tree
Hide file tree
Showing 97 changed files with 3,347 additions and 406 deletions.
40 changes: 40 additions & 0 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
# Contribute To TMS Sara Hilden Theme

Community-made patches, localisations, bug reports and contributions are welcome and help make TMS Sara Hilden Theme even better!

When contributing please ensure you follow the guidelines below so that we can keep on top of things.

## Getting Started

- Submit a ticket for your issue, assuming one does not already exist.
- Raise it on our Issue Tracker.
- Clearly describe the issue including steps to reproduce the bug.
- Make sure you fill in the earliest version that you know has the issue as well as the version of WordPress you're using.

## Making Changes

- Fork the repository on GitHub.
- Make the changes to your forked repository.
- Add unit / integration tests where necessary.
- Ensure you stick to the [Geniem Oy WordPress Coding Standards][wpcs] and have properly documented any new functions.
- When committing, reference your issue (if present) and include a note about the fix.
- Push the changes to your fork and submit a pull request to the 'develop' branch of the ... repository.

### Checking Your Changes

- Run code standards: `composer lint-all`
- Automatically fix (most) lint errors: `composer lint-fix`

## Code Documentation

- Please make sure that every method is documented well, and the documentation follows the standards.

At this point you're waiting on us to merge your pull request. We'll review all pull requests, and make suggestions and changes if necessary.

# Additional Resources
- [General GitHub Documentation][gh-help]
- [GitHub Pull Request documentation][gh-pr]

[gh-pr]: http://help.github.com/send-pull-requests/
[gh-help]: https://help.github.com/
[wpcs]: https://github.com/devgeniem/geniem-rules-codesniffer
28 changes: 28 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
---
name: Bug report
about: Create a report to help us improve

---

## Describe the bug
<!-- A clear and concise description of what the bug is. -->

## To Reproduce
<!-- Steps to reproduce the behaviour:
1. Go to '...'
2. Click on '....'
3. Scroll down to '....'
4. See error -->

## Expected behaviour
<!-- A clear and concise description of what you expected to happen. -->

## Screenshots
<!-- If applicable, add screenshots to help explain your problem. -->

## Environment

<!-- OS, browser, browser version, PHP version, WordPress version, active plugins, active theme, etc. -->

## Additional context
<!-- Add any other context about the problem here. -->
17 changes: 17 additions & 0 deletions .github/ISSUE_TEMPLATE/feature-request.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
---
name: Feature request
about: Suggest an idea for this project

---

## Is your feature request related to a problem?
<!-- A clear and concise description of what the problem is. Ex. I'm always frustrated when [...] -->

## Describe the solution you'd like
<!-- A clear and concise description of what you want to happen. -->

## Describe alternatives you've considered
<!-- A clear and concise description of any alternative solutions or features you've considered. -->

## Additional context
<!-- Add any other context or screenshots about the feature request here. -->
3 changes: 3 additions & 0 deletions .github/SUPPORT.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Support for TMS Vapriikki Theme

The best place to get support for this project is on the Issue Tracker.
31 changes: 31 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
# Please see the documentation for all configuration options:
# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates

version: 2
updates:
- package-ecosystem: "composer" # See documentation for possible values
directory: "/" # Location of package manifests
schedule:
interval: "daily"
# Prefix all commit messages with "Composer"
# include a list of updated dependencies
commit-message:
prefix: "Composer"
include: "scope"
# Specify labels for Composer pull requests
labels:
- "maintenance"
- "maintenance-composer"
- package-ecosystem: "npm"
directory: "/"
schedule:
interval: "daily"
# Prefix all commit messages with "NPM"
# include a list of updated dependencies
commit-message:
prefix: "NPM"
include: "scope"
# Specify labels for NPM pull requests
labels:
- "maintenance"
- "maintenance-npm"
35 changes: 35 additions & 0 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
Severa-ID: 2108
Severa-kuvaus:
Task: https://hiondigital.atlassian.net/browse/TMS-

<!--- Provide a general summary of your changes in the Title above -->

## Description

<!--- Describe your changes in detail -->

## Motivation and Context

<!--- Why is this change required? What problem does it solve? -->
<!--- If it fixes an open issue, please link to the issue here. -->

## How Has This Been Tested?
<!--- Please describe in detail how you tested your changes. -->
<!--- Include details of your testing environment, and the tests you ran to -->
<!--- see how your change affects other areas of the code, etc. -->

## Screenshots (if appropriate):

## Types of changes
<!--- What types of changes does your code introduce? Put an `x` in all the boxes that apply: -->
- [ ] Bug fix (non-breaking change which fixes an issue)
- [ ] New feature (non-breaking change which adds functionality)
- [ ] Breaking change (fix or feature that would cause existing functionality to change)

## Checklist:
<!--- Go over all the following points, and put an `x` in all the boxes that apply. -->
<!--- If you're unsure about any of these, don't hesitate to ask. We're here to help! -->
- [ ] My code follows the code style of this project.
- [ ] My change requires a change to the documentation.
- [ ] I have updated the documentation accordingly.
- [ ] I have read the [CONTRIBUTING] document.
37 changes: 37 additions & 0 deletions .github/workflows/phpcs-check.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
name: PHP CS Checks

on: [push]

jobs:
phpcs-check:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2

- name: Validate composer.json and composer.lock
run: composer validate

- name: Cache Composer packages
id: composer-cache
uses: actions/cache@v2
with:
path: vendor
key: ${{ runner.os }}-php-${{ hashFiles('**/composer.lock') }}
restore-keys: |
${{ runner.os }}-php-
- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: 7.4
extensions: simplexml
coverage: xdebug
env:
COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: Run PHPCS Check
run: |
composer install --prefer-dist --no-progress
composer require staabm/annotate-pull-request-from-checkstyle
./vendor/bin/phpcs -q --report=checkstyle | vendor/bin/cs2pr --graceful-warnings
70 changes: 70 additions & 0 deletions CHANGELOG.MD
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,76 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.

## [Unreleased]

## [1.2.6] - 2024-06-04

- TMS-1044: Accordion style changes

## [1.2.5] - 2024-05-20

- TMS-1028: Add social-media link column to footer

## [1.2.4] - 2024-05-14

- TMS-1029: Change contacts-blocks width

## [1.2.3] - 2024-03-26

- TMS-914: Change anchor-link blocks border-color
- TMS-1013: Add event weekly entry dates to event partial
- TMS-1021: Remove image carousel modal max-height

## [1.2.2] - 2024-03-18

- TMS-1017: Add image alt-text to imported news single-article

## [1.2.1] - 2024-02-01

- TMS-980: Add redipress_include_search to include component contents in search results

## [1.2.0] - 2023-11-21

- TMS-974: Recurring event layout changes
- TMS-935: Archive filter accessibility fixes

## [1.1.4] - 2023-10-23

- TMS-970: Add image meta to call-to-action and content-columns components

## [1.1.3] - 2023-10-12

### Fixed

- TMS-982: Fix exhibition-archive year-filters & search
- TMS-936: Image carousel accessibility fixes

### Changed

- TMS-981: Change past exhibition order to sort by end_date

## [1.1.2] - 2023-10-09

- TMS-978: Remove manual-event styles

## [1.1.1] - 2023-10-04

- TMS-978: Reduce single manual-event description line-height & margin

## [1.1.0] - 2023-09-25

- TMS-949:
- Fix related article images on single article page
- Fix colors on mobile nav

## [1.0.0] - 2023-09-13

- TMS-949:
- Add background-graphic option for call-to-action & content-columns components
- Add background-graphic to footer and event-card elements
- Add Exhibition-CPT
- Add Divider-block & component
- Change theme fonts
- Change theme styles

## [0.1.0] - 2023-09-04

- TMS-949: Modify theme to suit Milavida website
Binary file removed assets/fonts/Adelon-Bold.ttf
Binary file not shown.
Binary file removed assets/fonts/Adelon-Medium.ttf
Binary file not shown.
Binary file removed assets/fonts/Adelon-Regular.ttf
Binary file not shown.
Binary file removed assets/fonts/AdelonSerial-Bold.otf
Binary file not shown.
Binary file removed assets/fonts/AdelonSerial-Medium.otf
Binary file not shown.
Binary file removed assets/fonts/AdelonSerial.otf
Binary file not shown.
Binary file added assets/fonts/Montserrat-Bold.ttf
Binary file not shown.
Binary file added assets/fonts/Montserrat-Medium.ttf
Binary file not shown.
Binary file added assets/fonts/Montserrat-Regular.ttf
Binary file not shown.
Binary file added assets/fonts/Montserrat-SemiBold.ttf
Binary file not shown.
7 changes: 4 additions & 3 deletions assets/fonts/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,10 @@
import './fonts';

// Font families
import './Adelon-Bold.ttf';
import './Adelon-Medium.ttf';
import './Adelon-Regular.ttf';
import './Montserrat-Bold.ttf';
import './Montserrat-SemiBold.ttf';
import './Montserrat-Medium.ttf';
import './Montserrat-Regular.ttf';
import './RobotoSlab-Regular.ttf';
import './RobotoSlab-Medium.ttf';
import './RobotoSlab-SemiBold.ttf';
Expand Down
Binary file added assets/images/footer_bg.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
93 changes: 93 additions & 0 deletions assets/images/milavida_graphic.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 6 additions & 0 deletions assets/styles/blocks/_accordion.scss
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,10 @@
max-height: $image-max-height;
}
}

&__close-all,
&__open-all,
&__icon-text {
color: $black !important;
}
}
5 changes: 5 additions & 0 deletions assets/styles/blocks/_anchor-links.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
.anchor-links {
&__list {
border-left: 2px solid $color-milavida-grey;
}
}
1 change: 1 addition & 0 deletions assets/styles/blocks/index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@
@import "image";
@import "key-figures";
@import "link-list";
@import "anchor-links";
Loading

0 comments on commit b97d3e2

Please sign in to comment.