Skip to content

Commit 4c2558e

Browse files
rickhanloniiJoelMarcey
authored andcommitted
Fix margin for right-aligned images (#398)
Update so imageAlign* has a class for all directions
1 parent 373a3e6 commit 4c2558e

2 files changed

Lines changed: 9 additions & 2 deletions

File tree

lib/core/GridBlock.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,13 @@ class GridBlock extends React.Component {
1616
alignCenter: this.props.align === 'center',
1717
alignRight: this.props.align === 'right',
1818
fourByGridBlock: this.props.layout === 'fourColumn',
19-
imageAlignBottom: block.image && block.imageAlign === 'bottom',
2019
imageAlignSide:
2120
block.image &&
2221
(block.imageAlign === 'left' || block.imageAlign === 'right'),
2322
imageAlignTop: block.image && block.imageAlign === 'top',
23+
imageAlignRight: block.image && block.imageAlign === 'right',
24+
imageAlignBottom: block.image && block.imageAlign === 'bottom',
25+
imageAlignLeft: block.image && block.imageAlign === 'left',
2426
threeByGridBlock: this.props.layout === 'threeColumn',
2527
twoByGridBlock: this.props.layout === 'twoColumn',
2628
});

lib/static/css/main.css

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -795,7 +795,6 @@ pre code {
795795
.imageAlignSide .blockImage {
796796
max-width: 500px;
797797
flex: 0 1 500px;
798-
margin-right: 40px;
799798
}
800799
@media only screen and (min-device-width: 360px) and (max-device-width: 735px) {
801800
.imageAlignSide .blockImage {
@@ -821,6 +820,12 @@ pre code {
821820
margin-left: auto;
822821
margin-right: auto;
823822
}
823+
.imageAlignRight .blockImage {
824+
margin-left: 40px;
825+
}
826+
.imageAlignLeft .blockImage {
827+
margin-right: 40px;
828+
}
824829
.container .gridBlock .blockContent p {
825830
padding: 0;
826831
}

0 commit comments

Comments
 (0)