Skip to content

Commit

Permalink
Merge pull request #1129 from Automattic/master
Browse files Browse the repository at this point in the history
Alpha release May 05
  • Loading branch information
miguelpeixe authored May 5, 2022
2 parents ae622b8 + 0f65dd7 commit 441dedd
Show file tree
Hide file tree
Showing 5 changed files with 42 additions and 24 deletions.
14 changes: 7 additions & 7 deletions package-lock.json

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

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"fetch-mock-jest": "^1.5.1",
"html-entities": "^2.3.3",
"identity-obj-proxy": "^3.0.0",
"lint-staged": "^12.4.0",
"lint-staged": "^12.4.1",
"newspack-scripts": "^3.3.0",
"prettier": "npm:wp-prettier@^2.2.1-beta-1",
"stylelint": "^13.3.1"
Expand Down
1 change: 1 addition & 0 deletions src/blocks/carousel/view.php
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@ function newspack_blocks_render_block_carousel( $attributes ) {
'object-fit' => $attributes['imageFit'],
'layout' => 'fill',
'class' => 'contain' === $attributes['imageFit'] ? 'image-fit-contain' : 'image-fit-cover',
'alt' => trim( wp_strip_all_tags( get_the_title( $post_id ) ) ),
)
);
?>
Expand Down
48 changes: 32 additions & 16 deletions src/blocks/donate/view.scss
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,10 @@
width: 100%;

input[type='radio'] {
display: none;
left: -99999em;
position: absolute;
}

input[readonly] {
background-color: $color__background-screen;
color: #666;
Expand Down Expand Up @@ -89,8 +91,14 @@
}
}

input[type='radio']:checked {
+ .tier-label {
input[type='radio'] {
&:focus + .tier-label {
background: $color__background-screen;
outline: 1px dotted currentColor;
outline-offset: -4px;
}

&:checked + .tier-label {
background-color: $color__primary;
border-color: transparent;
color: $color__background-body;
Expand Down Expand Up @@ -245,26 +253,34 @@
}
}

input[type='radio']:checked {
+ .freq-label {
color: inherit;
input[type='radio'] {
&:checked {
+ .freq-label {
color: inherit;

&::before {
background: $color__text-main;
background-clip: content-box;
}
&::before {
background: $color__text-main;
background-clip: content-box;
}

@include media( tablet ) {
border-bottom-color: transparent;
@include media( tablet ) {
border-bottom-color: transparent;
}

&:hover {
background: $color__background-body;
}
}

&:hover {
background: $color__background-body;
~ .tiers {
display: flex;
}
}

~ .tiers {
display: flex;
&:focus + .freq-label {
text-decoration: underline;
text-decoration-style: dotted;
text-decoration-thickness: 1px;
}
}

Expand Down
1 change: 1 addition & 0 deletions src/blocks/homepage-articles/templates/article.php
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ function( $data ) {
}
$thumbnail_args = array(
'data-hero-candidate' => true,
'alt' => trim( wp_strip_all_tags( get_the_title( $post_id ) ) ),
);
// If the image position is behind, pass the object-fit setting to maintain styles with AMP.
if ( 'behind' === $attributes['mediaPosition'] ) {
Expand Down

0 comments on commit 441dedd

Please sign in to comment.