Skip to content

Commit b62ee01

Browse files
TheSharpieOneeddywashere
authored andcommitted
feat(Col): Update Col component with alpha 3 changes
1 parent f617dc5 commit b62ee01

2 files changed

Lines changed: 6 additions & 6 deletions

File tree

src/Col.jsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,9 @@ const Col = (props) => {
4444
} else if (columnProp.size) {
4545
colClasses.push(classNames({
4646
[`col-${colSize}-${columnProp.size}`]: columnProp.size,
47-
[`col-${colSize}-push-${columnProp.push}`]: columnProp.push,
48-
[`col-${colSize}-pull-${columnProp.pull}`]: columnProp.pull,
49-
[`col-${colSize}-offset-${columnProp.offset}`]: columnProp.offset
47+
[`push-${colSize}-${columnProp.push}`]: columnProp.push,
48+
[`pull-${colSize}-${columnProp.pull}`]: columnProp.pull,
49+
[`offset-${colSize}-${columnProp.offset}`]: columnProp.offset
5050
}));
5151
} else {
5252
colClasses.push(`col-${colSize}-${columnProp}`);

test/Col.spec.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ describe('Col', () => {
4242

4343
expect(wrapper.hasClass('col-sm-6')).toBe(true);
4444
expect(wrapper.hasClass('col-xs-12')).toBe(true);
45-
expect(wrapper.hasClass('col-sm-push-2')).toBe(true);
46-
expect(wrapper.hasClass('col-sm-pull-2')).toBe(true);
47-
expect(wrapper.hasClass('col-sm-offset-2')).toBe(true);
45+
expect(wrapper.hasClass('push-sm-2')).toBe(true);
46+
expect(wrapper.hasClass('pull-sm-2')).toBe(true);
47+
expect(wrapper.hasClass('offset-sm-2')).toBe(true);
4848
});
4949
});

0 commit comments

Comments
 (0)