Skip to content
This repository has been archived by the owner on Feb 23, 2024. It is now read-only.

Remove classname from cart image to avoid conflicts #8898

Merged
merged 2 commits into from
Apr 5, 2023
Merged

Remove classname from cart image to avoid conflicts #8898

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0b2c434
Remove classname from cart image to avoid conflicts
mikejolley Mar 29, 2023
03d67ca
Merge branch 'add/global-style-for-cart-checkout' into fix/product-im…
nielslange Apr 5, 2023
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
146 changes: 73 additions & 73 deletions assets/js/base/components/cart-checkout/order-summary/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,97 +8,97 @@
.wc-block-components-panel__content {
margin-bottom: 0;
}
}

.wc-block-components-order-summary__content {
display: table;
width: 100%;
}
.wc-block-components-order-summary__content {
display: table;
width: 100%;
}

.wc-block-components-order-summary-item {
@include with-translucent-border(0 0 1px);
@include font-size(small);
display: flex;
padding-bottom: 1px;
padding-top: $gap;
width: 100%;
.wc-block-components-order-summary-item {
@include with-translucent-border(0 0 1px);
@include font-size(small);
display: flex;
padding-bottom: 1px;
padding-top: $gap;
width: 100%;

&:first-child {
padding-top: 0;
}
&:first-child {
padding-top: 0;
}

&:last-child {
> div {
padding-bottom: 0;
&:last-child {
> div {
padding-bottom: 0;
}

&::after {
display: none;
}
}

&::after {
display: none;
.wc-block-components-product-metadata {
@include font-size(regular);
}
}

.wc-block-components-product-metadata {
@include font-size(regular);
.wc-block-components-order-summary-item__image,
.wc-block-components-order-summary-item__description {
display: table-cell;
vertical-align: top;
}
}

.wc-block-components-order-summary-item__image,
.wc-block-components-order-summary-item__description {
display: table-cell;
vertical-align: top;
}

.wc-block-components-order-summary-item__image {
width: #{$gap-large * 2};
padding-bottom: $gap;
position: relative;

> img {
.wc-block-components-order-summary-item__image {
width: #{$gap-large * 2};
max-width: #{$gap-large * 2};
padding-bottom: $gap;
position: relative;

> img {
width: #{$gap-large * 2};
max-width: #{$gap-large * 2};
}
}
}

.wc-block-components-order-summary-item__quantity {
align-items: center;
background: #fff;
border: 2px solid;
border-radius: 1em;
box-shadow: 0 0 0 2px #fff;
color: #000;
display: flex;
line-height: 1;
min-height: 20px;
padding: 0 0.4em;
position: absolute;
justify-content: center;
min-width: 20px;
right: 0;
top: 0;
transform: translate(50%, -50%);
white-space: nowrap;
z-index: 1;
}
.wc-block-components-order-summary-item__quantity {
align-items: center;
background: #fff;
border: 2px solid;
border-radius: 1em;
box-shadow: 0 0 0 2px #fff;
color: #000;
display: flex;
line-height: 1;
min-height: 20px;
padding: 0 0.4em;
position: absolute;
justify-content: center;
min-width: 20px;
right: 0;
top: 0;
transform: translate(50%, -50%);
white-space: nowrap;
z-index: 1;
}

.wc-block-components-order-summary-item__description {
padding-left: $gap-large;
padding-right: $gap-small;
padding-bottom: $gap;
.wc-block-components-order-summary-item__description {
padding-left: $gap-large;
padding-right: $gap-small;
padding-bottom: $gap;

p,
.wc-block-components-product-metadata {
line-height: 1.375;
margin-top: #{ ($gap-large - $gap) * 0.5 };
p,
.wc-block-components-product-metadata {
line-height: 1.375;
margin-top: #{ ($gap-large - $gap) * 0.5 };
}
}
}

.wc-block-components-order-summary-item__total-price {
font-weight: bold;
margin-left: auto;
text-align: right;
}
.wc-block-components-order-summary-item__total-price {
font-weight: bold;
margin-left: auto;
text-align: right;
}


.wc-block-components-order-summary-item__individual-prices {
display: block;
.wc-block-components-order-summary-item__individual-prices {
display: block;
}
}
13 changes: 1 addition & 12 deletions assets/js/base/components/cart-checkout/product-image/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,6 @@
import { decodeEntities } from '@wordpress/html-entities';
import { PLACEHOLDER_IMG_SRC } from '@woocommerce/settings';

/**
* Internal dependencies
*/
import './style.scss';

interface ProductImageProps {
image: { alt?: string; thumbnail?: string };
fallbackAlt: string;
Expand Down Expand Up @@ -37,13 +32,7 @@ const ProductImage = ( {
alt: '',
};

return (
<img
className="wc-block-components-product-image"
{ ...imageProps }
alt={ imageProps.alt }
/>
);
return <img { ...imageProps } alt={ imageProps.alt } />;
};

export default ProductImage;
3 changes: 0 additions & 3 deletions assets/js/base/components/cart-checkout/product-image/style.scss
View file
Open in desktop

This file was deleted.