Skip to content

Commit

Permalink
Merge f63ca62 into ee6f850
Browse files Browse the repository at this point in the history
  • Loading branch information
jgfidelis authored Aug 2, 2019
2 parents ee6f850 + f63ca62 commit a6babf7
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 5 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).

## [Unreleased]
### Fixed
- Fix styles issues with overflows.

## [2.31.0] - 2019-08-01
### Added
Expand Down
4 changes: 2 additions & 2 deletions react/__tests__/__snapshots__/ProductSummary.test.js.snap
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ exports[`<ProductSummary /> component should match the snapshot for inline norma
exports[`<ProductSummary /> component should match the snapshot for inline price mode 1`] = `
<DocumentFragment>
<section
class="container containerInline overflow-hidden br3 h-100 w-100 overflow-y-auto"
class="container containerInline br3 h-100 w-100"
>
<article
class="element pointer ph2 pt3 pb4 flex flex-column h-100"
Expand Down Expand Up @@ -167,7 +167,7 @@ exports[`<ProductSummary /> component should match the snapshot for inline price
</div>
</div>
<div
class="information w-70 pb2 ph3 overflow-y-auto"
class="information w-70 pb2 ph3"
>
<div
class="flex items-start justify-left tl w-90 t-mini pb2"
Expand Down
4 changes: 3 additions & 1 deletion react/legacy/components/AttachmentList.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,9 @@ const AttachmentList = ({ product }) => {

return (
<div className={`${styles.attachmentListContainer} pv2`}>
<AddedAttachmentsList addedOptions={filteredOption} />
<AddedAttachmentsList
addedOptions={filteredOption}
/>
<RemovedAttachmentsList removedOptions={removedOptions} />
</div>
)
Expand Down
4 changes: 2 additions & 2 deletions react/legacy/components/ProductSummaryInlinePrice.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ const ProductSummaryInlinePrice = ({
const containerClasses = classNames(
styles.container,
styles.containerInline,
'overflow-hidden br3 h-100 w-100 overflow-y-auto'
'br3 h-100 w-100'
)

const summaryClasses = classNames(
Expand Down Expand Up @@ -82,7 +82,7 @@ const ProductSummaryInlinePrice = ({
<div className={`${styles.imageContainer} db h-100`}>
<ProductImage {...imageProps} />
</div>
<div className={`${styles.information} w-70 pb2 ph3 overflow-y-auto`}>
<div className={`${styles.information} w-70 pb2 ph3`}>
<ProductSummaryName {...nameProps} {...nameClasses} />
<AttachmentList product={product} />
<div className="mv3 nr2">
Expand Down

0 comments on commit a6babf7

Please sign in to comment.