Skip to content

Commit

Permalink
Merge pull request #1374 from Automattic/trunk
Browse files Browse the repository at this point in the history
Alpha release Nov 29
  • Loading branch information
leogermani authored Nov 29, 2024
2 parents 555761b + 4d090ca commit 69efbb1
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 16 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/changelog.yml
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
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
16 changes: 8 additions & 8 deletions package-lock.json

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
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
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

0 comments on commit 69efbb1

Please sign in to comment.