Skip to content

Commit

Permalink
Merge pull request #35 from eea/develop
Browse files Browse the repository at this point in the history
  • Loading branch information
nileshgulia1 authored Dec 19, 2022
2 parents 1982a47 + 6e26e79 commit 97c5770
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 4 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,16 @@ All notable changes to this project will be documented in this file. Dates are d

Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).

### [1.0.33](https://github.com/eea/volto-energy-theme/compare/1.0.32...1.0.33) - 19 December 2022

#### :hammer_and_wrench: Others

- override volto-block-styles [nileshgulia1 - [`0f6d4b4`](https://github.com/eea/volto-energy-theme/commit/0f6d4b4cf8aacd92b0de98fcca1ebb451f40cd8c)]
### [1.0.32](https://github.com/eea/volto-energy-theme/compare/1.0.31...1.0.32) - 19 December 2022

#### :hammer_and_wrench: Others

- Merge pull request #34 from eea/develop [Nilesh - [`1982a47`](https://github.com/eea/volto-energy-theme/commit/1982a47aaf617289e4ebc814801fd47756d5e9f8)]
- rule out integration tests [nileshgulia1 - [`b2383ea`](https://github.com/eea/volto-energy-theme/commit/b2383ea4085f2097b54e9d37411f80b01e897fdd)]
- cypress-fail-fast [nileshgulia1 - [`7ec360c`](https://github.com/eea/volto-energy-theme/commit/7ec360c26122a9332aaac8ffa78f61ee58852693)]
- fix tests [nileshgulia1 - [`bc1b4cb`](https://github.com/eea/volto-energy-theme/commit/bc1b4cb2662dff3fdfac676d74011f9be1d380f8)]
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@eeacms/volto-energy-theme",
"version": "1.0.32",
"version": "1.0.33",
"description": "@eeacms/volto-energy-theme: Volto add-on",
"main": "src/index.js",
"author": "European Environment Agency: IDM2 A-Team",
Expand Down Expand Up @@ -30,8 +30,8 @@
"devDependencies": {
"@cypress/code-coverage": "^3.9.5",
"@plone/scripts": "*",
"cypress-fail-fast": "^5.0.1",
"babel-plugin-transform-class-properties": "^6.24.1",
"cypress-fail-fast": "^5.0.1",
"md5": "^2.3.0"
},
"scripts": {
Expand Down
4 changes: 2 additions & 2 deletions theme/site/globals/site.overrides
Original file line number Diff line number Diff line change
Expand Up @@ -556,11 +556,11 @@ body:not(.has-toolbar-collapsed):not(.anonymous) {

// to override volto-blocks-style
body:not(.view-editview):not(.document_wide_view):not(.is-anonymous) main {
overflow: inherit;
overflow: inherit !important;
}

body:not(.is-authenticated):not(.document_wide_view) main, body:not(.view-editview):not(.document_wide_view):not(.is-anonymous) main {
overflow: inherit;
overflow: inherit !important;
}

.personal-tools.pastanaga-menu {
Expand Down

0 comments on commit 97c5770

Please sign in to comment.