Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: devgeniem/tms-theme-filharmonia
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 1.7.0
Choose a base ref
...
head repository: devgeniem/tms-theme-filharmonia
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Loading
Showing with 7,013 additions and 3,607 deletions.
  1. +4 −0 .github/PULL_REQUEST_TEMPLATE.md
  2. +1 −1 .github/workflows/phpcs-check.yml
  3. +155 −0 CHANGELOG.MD
  4. BIN assets/images/favicon.png
  5. +2 −0 assets/images/index.js
  6. +42 −0 assets/images/tampere-vaakuna-color.svg
  7. +9 −0 assets/styles/_color_overrides.scss
  8. +21 −0 assets/styles/blocks/_image-gallery.scss
  9. +1 −0 assets/styles/blocks/_index.scss
  10. +5 −0 assets/styles/layouts/_accordion.scss
  11. +52 −0 assets/styles/layouts/_articles.scss
  12. +9 −0 assets/styles/layouts/_content-columns.scss
  13. +9 −0 assets/styles/layouts/_events.scss
  14. +2 −29 assets/styles/layouts/_hero.scss
  15. +17 −0 assets/styles/layouts/_link-list.scss
  16. +9 −0 assets/styles/layouts/_logo-wall.scss
  17. +13 −0 assets/styles/layouts/_materials.scss
  18. +16 −0 assets/styles/layouts/_quote.scss
  19. +22 −0 assets/styles/layouts/_subpages.scss
  20. +7 −0 assets/styles/layouts/_textblock.scss
  21. +10 −0 assets/styles/layouts/index.scss
  22. +1 −0 assets/styles/main.scss
  23. +15 −0 assets/styles/overrides/_breadcrumb.scss
  24. +29 −7 assets/styles/overrides/_button.scss
  25. +9 −1 assets/styles/overrides/_colors.scss
  26. +13 −0 assets/styles/overrides/_events.scss
  27. +58 −0 assets/styles/overrides/_fly-out-nav.scss
  28. +29 −0 assets/styles/overrides/_footer.scss
  29. +12 −0 assets/styles/overrides/_forms.scss
  30. +8 −2 assets/styles/overrides/_grid.scss
  31. +55 −0 assets/styles/overrides/_header-top.scss
  32. +10 −0 assets/styles/overrides/_headings.scss
  33. +29 −2 assets/styles/overrides/_notice-banner.scss
  34. +12 −0 assets/styles/overrides/_pill.scss
  35. +45 −3 assets/styles/overrides/_primary-nav.scss
  36. +1 −0 assets/styles/overrides/_share-links.scss
  37. +9 −0 assets/styles/overrides/_slide-deck.scss
  38. +14 −7 assets/styles/overrides/index.scss
  39. +3 −2 assets/styles/settings/brand/_functions.scss
  40. +7 −1 assets/styles/theme-filharmonia.scss
  41. +56 −0 assets/styles/ui-components/_pill.scss
  42. +1 −0 assets/styles/ui-components/index.scss
  43. +3 −0 assets/styles/utils/_border.scss
  44. +2 −0 assets/styles/utils/index.scss
  45. +27 −29 assets/styles/views/_archive-artist.scss
  46. +11 −0 assets/styles/views/_page-materials.scss
  47. +33 −0 assets/styles/views/_single.scss
  48. +2 −0 assets/styles/views/index.scss
  49. +9 −3 composer.json
  50. +42 −0 lib/ACF/AlterPageSettingsFields.php
  51. +84 −0 lib/ACF/ArtistCategoryGroup.php
  52. +24 −0 lib/ACF/ArtistGroup.php
  53. +34 −23 lib/ACF/Layouts/HeroLayout.php
  54. +24 −1 lib/Formatters/HeroFormatter.php
  55. +2 −3 lib/PostType/Artist.php
  56. +151 −15 lib/ThemeCustomizationController.php
  57. +8 −0 lib/ThemeSupports.php
  58. +95 −35 models/archive-artist.php
  59. +58 −0 models/page-orchester.php
  60. +4,902 −3,356 package-lock.json
  61. +14 −14 package.json
  62. +28 −51 partials/archive-artist.dust
  63. +40 −0 partials/blocks/block-image-gallery.dust
  64. +28 −12 partials/layouts/layout-hero.dust
  65. +70 −0 partials/page-materials.dust
  66. +46 −0 partials/page-orchester.dust
  67. +9 −5 partials/shared/additional-info-list.dust
  68. +2 −2 partials/shared/additional-info-row.dust
  69. +135 −0 partials/shared/contact.dust
  70. +12 −2 partials/single-artist.dust
  71. +46 −0 partials/ui/artist-item.dust
  72. +29 −0 partials/ui/breadcrumbs.dust
  73. +5 −0 partials/ui/entry-title.dust
  74. +77 −0 partials/ui/event-highlight.dust
  75. +5 −0 partials/ui/event-item-pill.dust
  76. +22 −0 partials/ui/menu/menu-item-dropdown-content.dust
  77. +5 −0 partials/ui/menu/menu-item-single.dust
  78. +27 −0 partials/ui/menu/menu-item.dust
  79. +15 −0 partials/views/page/page-hero.dust
  80. +25 −0 partials/views/single-dynamic-event/single-dynamic-event-hero.dust
  81. +39 −0 partials/views/single/single-meta.dust
  82. +1 −1 style.css
4 changes: 4 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
Severa-ID: 2129
Severa-kuvaus:
Task: https://hiondigital.atlassian.net/browse/TMS-

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

## Description
2 changes: 1 addition & 1 deletion .github/workflows/phpcs-check.yml
Original file line number Diff line number Diff line change
@@ -24,7 +24,7 @@ jobs:
- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: 7.4
php-version: 8.1
extensions: simplexml
coverage: xdebug
env:
155 changes: 155 additions & 0 deletions CHANGELOG.MD
Original file line number Diff line number Diff line change
@@ -7,8 +7,163 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.

## [Unreleased]

## [1.15.2] - 2025-02-24

- TMS-1100: Show multiple locations for events if available

## [1.15.1] - 2024-09-25

- TMS-1067: Show price-info for event in listing if it's free

## [1.15.0] - 2024-08-21

- TMS-1058: Remove text-decoration & decrease font-size for single-post h1-heading

## [1.14.0] - 2024-06-17

- TMS-1054: Remove hero overlay-toggle from single page editor

## [1.13.0] - 2024-06-17

- TMS-1045: Style changes:
- Remove "Tampere Filharmonia" pseudo text-elements from hero
- Change hero CTA-button colors
- Change footer "Tampere"-logo color
- Change page background-color from grey to white
- Add borders to elements with a white background

## [1.12.2] - 2024-05-20

- TMS-1028: Fix footer social-media icon color

## [1.12.1] – 2023-05-24

### Changed

- TMS-931: Navigation accessibility fixes

## [1.12.0] – 2023-04-11

- PIEN-8157: PHP 8.1

## [1.11.8] – 2023-03-13

### Changed

- PIEN-8359: Allow custom url links in menus

## [1.11.7] – 2023-01-09

### Changed

- TMS-922: Add option to display hero description as a link

## [1.11.6] – 2022-02-11

### Changed

- TMS-911-2: Group artist archive results by category #76

### Added

- TMS-911: Add page template Orchester

## [1.11.5] – 2022-08-23

- TMS-894: Fix composer

## [1.11.4] – 2022-05-02

- Image hotfix for contact.dust

## [1.11.3] – 2022-02-24

- Replace node-sass with dart-sass

## [1.11.2]

### Changed

- TMS-421-161221: Use formatter filters for modifying image carousel. #50
- TMS-421: Update notice banner colors #51

## [1.11.1] - 2021-12-14

- TMS-555: Change artist short description field to texteditor #47

## [1.11.0] - 2021-12-13

### Changed

- TMS-560: Hide event categories #49

## Added

- Add favicon

## [1.10.0] - 2021-12-13

### Changed

- TMS-421-viljami: Misc style fixes
- TMS-421-2: Fix is_clickable setting in block-image-gallery partial
- TMS-421: Fixes before site's publishing
- Nav styles and classes
- Header styles
- Footer styles
- Breadcrumbs styles
- Colors
- Link and button styles
- Event highlights
- Single Article styles
- Materials styles
- Hero styles
- Accordion styles
- Quote styles
- Table styles
- Link list styles
- Subpages layout styles
- Contact styles
- Gallery styles

## [1.9.2] - 2021-11-30

### Added

- TMS-370: Check that single artist's additional info has title and text.

## [1.9.1] - 2021-11-26

### Changed

- TMS-413: Tampere logo focus styles


## [1.9.0] - 2021-11-04

### Changed

- TMS-358 Single Artist: Table's fonts fixed.
- TMS-357 Single Artist: Layout changes.

### Added

- TMS-357 Single Artist: New ACF field fort short desc.

## [1.8.0] - 2021-10-25

### Changed

- TMS-349: Fix event view styles #29
- TMS-348: Make post type url slugs translatable with Polylang #30
- TMS-346: Fix principal and concertmaster mix up #27

## [1.7.0] - 2021-10-14

### Changed

- TMS-347: Remove pagination from artist archive #28

### Added

- TMS-212: Search view #22
Binary file added assets/images/favicon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 2 additions & 0 deletions assets/images/index.js
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
import './tampere-filharmonia-pysty.svg';
import './tampere-pysty.svg';
import './tampere-vaakuna-color.svg';
import './favicon.png';
42 changes: 42 additions & 0 deletions assets/images/tampere-vaakuna-color.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 9 additions & 0 deletions assets/styles/_color_overrides.scss
Original file line number Diff line number Diff line change
@@ -85,3 +85,12 @@ $fly-out-nav-search-input-background-color: $secondary;
assets/styles/ui-components/_footer.scss
--------------------------------------------------------------*/
$footer-copy-link-border-color: $secondary-invert;

/*--------------------------------------------------------------
assets/styles/ui-components/_table.scss
--------------------------------------------------------------*/
$table-background-color: $secondary;
$table-row-background-color-even: $color-white;
$table-row-background-color-odd: $secondary;
$table-row-background-color-even-hover: $color-vaalean-harmaa;
$table-row-background-color-odd-hover: $secondary-dark;
21 changes: 21 additions & 0 deletions assets/styles/blocks/_image-gallery.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
.image-carousel__inner {
.slick-arrow {
color: $primary !important;
background-color: unset !important;
border: unset !important;

&:hover,
&:focus {
background-color: unset !important;
box-shadow: unset !important;
}

.icon {
fill: currentColor !important;
}

&.is-primary .icon {
fill: $primary !important;
}
}
}
1 change: 1 addition & 0 deletions assets/styles/blocks/_index.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
@import "image-gallery";
5 changes: 5 additions & 0 deletions assets/styles/layouts/_accordion.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
.accordion {
&__row {
border-color: #b0b0b0 !important;
}
}
52 changes: 52 additions & 0 deletions assets/styles/layouts/_articles.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
/*!
* Copyright (c) 2021. Geniem Oy
*/

.Home,
.layout-articles {
&__title {
margin-bottom: 0 !important;
text-transform: uppercase;
}

&__description {
margin-top: 2rem !important;
margin-bottom: 0 !important;
}

.highlight-article {
margin-top: 2rem !important;

.pill {
background-color: transparent;
}
}

.entry {
font-family: $family-secondary;

&__excerpt {
> span {
font-weight: 400 !important;
}
}

.pill {
background-color: transparent !important;
}
}

&__read-more {
font-weight: 700 !important;
}
}

.Home,
.layout-articles,
.layout-blog-articles {
.highlight-article {
.has-background-secondary {
border: 1px solid $secondary-invert !important;
}
}
}
9 changes: 9 additions & 0 deletions assets/styles/layouts/_content-columns.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
/*!
* Copyright (c) 2021. Geniem Oy
*/

.content-columns {
&__title {
color: $black;
}
}
9 changes: 9 additions & 0 deletions assets/styles/layouts/_events.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
/*!
* Copyright (c) 2021. Geniem Oy
*/

.events {
h2 {
text-transform: uppercase;
}
}
31 changes: 2 additions & 29 deletions assets/styles/layouts/_hero.scss
Original file line number Diff line number Diff line change
@@ -22,6 +22,8 @@
}

&__description {
font-weight: $weight-normal;

> * {
padding: .25rem .5rem;
}
@@ -36,35 +38,6 @@

@include from($desktop) {
min-height: 36.198vw !important; // sass-lint:disable-line no-important

&::before,
&::after {
content: '';
position: absolute;
top: 0;
bottom: 0;
z-index: 1;
width: 40px;
height: 100%;
background-repeat: no-repeat;
background-position-y: center;
background-size: contain;
}

&::before {
top: 7.5%;
bottom: 7.5%;
left: 0;
height: 85%;
background-image: url('images/tampere-pysty.svg');
background-position-x: 0;
}

&::after {
right: 0;
background-image: url('images/tampere-filharmonia-pysty.svg');
background-position-x: 100%;
}
}

@include from(1600px) {
Loading