Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release Dec 09 #1376

Merged
merged 9 commits into from
Dec 9, 2024
Merged

Release Dec 09 #1376

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
6ec34ee
fix: hide cpt from menu (#1365)
miguelpeixe Nov 18, 2024
e1b096b
chore(deps): bump qs from 6.13.0 to 6.13.1
dependabot[bot] Nov 18, 2024
754f78b
chore(deps-dev): bump @wordpress/browserslist-config
dependabot[bot] Nov 18, 2024
c35772f
fix: prevent issue with double-scrollbars in really specific circumst…
laurelfulford Nov 18, 2024
f8e12fa
chore: remove dependabot pulls from changelog workflow (#1369)
leogermani Nov 19, 2024
96a6549
chore(release): merge in release v3.1.3
matticbot Nov 19, 2024
4d090ca
chore(release): merge in release v3.1.4
matticbot Nov 25, 2024
69efbb1
Merge pull request #1374 from Automattic/trunk
leogermani Nov 29, 2024
c3e3df1
chore(release): 3.1.5-alpha.1 [skip ci]
semantic-release-bot Nov 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/changelog.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:

jobs:
labeler:
if: github.event.pull_request.merged == true && github.event.pull_request.base.ref == 'trunk'
if: github.event.pull_request.merged == true && github.event.pull_request.base.ref == 'trunk' && github.event.pull_request.user.login != 'dependabot[bot]'
permissions:
contents: read
pull-requests: write
Expand All @@ -14,7 +14,7 @@ jobs:
- uses: actions/labeler@v5

comment_pr:
if: github.event.pull_request.merged == true && github.event.pull_request.base.ref == 'trunk'
if: github.event.pull_request.merged == true && github.event.pull_request.base.ref == 'trunk' && github.event.pull_request.user.login != 'dependabot[bot]'
permissions:
contents: read
pull-requests: write
Expand All @@ -25,7 +25,7 @@ jobs:
uses: thollander/actions-comment-pull-request@v3
with:
message: |
Hey @${{ github.event.pull_request.assignee.login }}, good job getting this PR merged! :tada:
Hey @${{ github.event.pull_request.user.login }}, good job getting this PR merged! :tada:

Now, the `needs-changelog` label has been added to it.

Expand Down
1 change: 1 addition & 0 deletions includes/class-newspack-popups.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,7 @@ public static function register_cpt() {
$cpt_args = [
'labels' => $labels,
'public' => false,
'show_in_menu' => false,
'show_ui' => true,
'show_in_rest' => true,
'supports' => [ 'editor', 'title', 'custom-fields', 'thumbnail', 'revisions' ],
Expand Down
2 changes: 1 addition & 1 deletion newspack-popups.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
* Author URI: https://newspack.com
* Text Domain: newspack-popups
* Domain Path: /languages
* Version: 3.1.4
* Version: 3.1.5-alpha.1
*
* @package Newspack_Popups
*/
Expand Down
16 changes: 8 additions & 8 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,11 @@
"intersection-observer": "^0.12.2",
"js-cookie": "^3.0.5",
"newspack-components": "^3.1.0",
"qs": "^6.13.0"
"qs": "^6.13.1"
},
"devDependencies": {
"@rushstack/eslint-patch": "^1.10.4",
"@wordpress/browserslist-config": "^6.11.0",
"@wordpress/browserslist-config": "^6.12.0",
"eslint": "^8.57.0",
"lint-staged": "^15.2.10",
"newspack-scripts": "^5.5.2",
Expand Down
4 changes: 1 addition & 3 deletions src/view/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ $width__tablet: 782px;
background: white;
border: none;
box-shadow: 0 0 1em 0.5em rgba(black, 0.1);
overflow-x: hidden;
overflow: hidden;
position: relative;
transform: none;
transition: transform 0.2s ease-in-out;
Expand Down Expand Up @@ -267,15 +267,13 @@ $width__tablet: 782px;
&.newspack-lightbox-placement-top_right {
.newspack-popup-wrapper {
max-height: calc(100% - #{$overlay__gap});
overflow-y: auto;
}
}

&.newspack-lightbox-placement-bottom,
&.newspack-lightbox-placement-top {
.newspack-popup-wrapper {
max-height: 100%;
overflow-y: auto;
}
}

Expand Down
Loading