Skip to content

Commit

Permalink
Merge branch 'develop' into staging
Browse files Browse the repository at this point in the history
  • Loading branch information
jaymcp committed Oct 10, 2024
2 parents b1cf8db + a4838b7 commit 7f26c17
Show file tree
Hide file tree
Showing 6 changed files with 102 additions and 130 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
### v1.1.1
Fixes:
- Add pages to default search post types

### v1.1.0
Features:
- Introduce full site editing support
Expand Down
4 changes: 2 additions & 2 deletions amnesty-petitions.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
Plugin Name: Humanity Petitions
Plugin URI: https://github.com/amnestywebsite/humanity-petitions
Description: Enable petitions support, with interface for synchronising data to a CRM. CRM integrations not included.
Version: 1.1.0
Version: 1.1.1
Author: Amnesty International
Author URI: https://www.amnesty.org
License: GPLv2
Expand All @@ -18,7 +18,7 @@
Network: true
Requires PHP: 8.2.0
Requires at least: 5.8.0
Tested up to: 6.4.2
Tested up to: 6.4.5
*/

if ( ! defined( 'ABSPATH' ) ) {
Expand Down
2 changes: 1 addition & 1 deletion private/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
"stylelint": "^16.2.1",
"stylelint-scss": "^6.1.0",
"stylelint-webpack-plugin": "^5.0.0",
"webpack": "^5.90.1",
"webpack": "^5.94.0",
"webpack-cli": "^5.1.4"
}
}
21 changes: 0 additions & 21 deletions private/src/frontend/blocks/petition/index.js

This file was deleted.

8 changes: 4 additions & 4 deletions private/src/style.scss
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@

.petition-title,
.petition-subtitle {
font-family: var(--font-family-secondary);
font-family: var(--wp--preset--font-family--secondary);
text-align: center;
}

Expand Down Expand Up @@ -102,7 +102,7 @@
padding: 12px 32px 12px 10px;
width: 100%;
border: 1px solid #000;
font-family: var(--font-family-secondary);
font-family: var(--wp--preset--font-family--secondary);
font-size: 16px;
font-weight: 600;
text-transform: uppercase;
Expand Down Expand Up @@ -154,15 +154,15 @@
width: 100%;
border-radius: 0;
border: 1px solid #000;
font-family: var(--font-family-primary);
font-family: var(--wp--preset--font-family--primary);
text-transform: unset;

&:last-child {
margin-bottom: 0;
}

@include placeholder {
font-family: var(--font-family-primary);
font-family: var(--wp--preset--font-family--primary);
}
}

Expand Down
Loading

0 comments on commit 7f26c17

Please sign in to comment.