Skip to content

Adds lost-column: none rule #211

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
peterramsing merged 3 commits into from
Jan 4, 2016
Merged

Adds lost-column: none rule #211

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a078b3b
adds tests for the lost-column: none rule
peterramsing Dec 30, 2015
706f37a
adds implementation for the lost-column: none rule
peterramsing Dec 30, 2015
7d4ef6a
adds doc in README for the lost-column: none rule
peterramsing Dec 30, 2015
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
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ div:nth-child(3n + 1) {

##### Basic Columns

To create a basic horizontal grid, just insert some elements into any containing element like so and pass a fraction to the `lost-column` property.
To create a basic horizontal grid, just insert some elements into any containing element like so and pass a fraction to the `lost-column` property. To unset (or remove) a column rule, possibly at a larger breakpoint, use `lost-column: none;`

```html
<section>
Expand Down
205 changes: 119 additions & 86 deletions lib/lost-column.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,132 +40,165 @@ module.exports = function lostColumnDecl(css, settings) {
lostColumnGutter = settings.gutter,
lostColumnFlexbox = settings.flexbox;

if (settings.cycle === 'auto') {
lostColumnCycle = decl.value.split('/')[1];
} else {
lostColumnCycle = settings.cycle;
}

declArr = decl.value.split(' ');
lostColumn = declArr[0];

if (declArr[1] !== undefined && declArr[1].search(/^\d/) !== -1) {
lostColumnCycle = declArr[1];
}
if (decl.value !== 'none') {
if (settings.cycle === 'auto') {
lostColumnCycle = decl.value.split('/')[1];
} else {
lostColumnCycle = settings.cycle;
}

if (declArr[1] == 'flex' || declArr[1] == 'no-flex' || declArr[1] == 'auto') {
lostColumnCycle = declArr[0].split('/')[1];
}
declArr = decl.value.split(' ');
lostColumn = declArr[0];

if (declArr[2] !== undefined && declArr[2].search(/^\d/) !== -1) {
lostColumnGutter = declArr[2];
}
if (declArr[1] !== undefined && declArr[1].search(/^\d/) !== -1) {
lostColumnCycle = declArr[1];
}

if (declArr.indexOf('flex') !== -1) {
lostColumnFlexbox = 'flex';
}
if (declArr[1] == 'flex' || declArr[1] == 'no-flex' || declArr[1] == 'auto') {
lostColumnCycle = declArr[0].split('/')[1];
}

if (declArr.indexOf('no-flex') !== -1) {
lostColumnFlexbox = 'no-flex';
}
if (declArr[2] !== undefined && declArr[2].search(/^\d/) !== -1) {
lostColumnGutter = declArr[2];
}

decl.parent.nodes.forEach(function (decl) {
if (decl.prop == 'lost-column-cycle') {
lostColumnCycle = decl.value;
if (declArr.indexOf('flex') !== -1) {
lostColumnFlexbox = 'flex';
}

decl.remove();
if (declArr.indexOf('no-flex') !== -1) {
lostColumnFlexbox = 'no-flex';
}
});

decl.parent.nodes.forEach(function (decl) {
if (decl.prop == 'lost-column-gutter') {
lostColumnGutter = decl.value;
decl.parent.nodes.forEach(function (decl) {
if (decl.prop == 'lost-column-cycle') {
lostColumnCycle = decl.value;

decl.remove();
}
});
decl.remove();
}
});

decl.parent.nodes.forEach(function (decl) {
if (decl.prop == 'lost-column-flexbox') {
if (decl.prop == 'flex') {
lostColumnFlexbox = 'flex';
decl.parent.nodes.forEach(function (decl) {
if (decl.prop == 'lost-column-gutter') {
lostColumnGutter = decl.value;

decl.remove();
}
});

decl.remove();
}
});
decl.parent.nodes.forEach(function (decl) {
if (decl.prop == 'lost-column-flexbox') {
if (decl.prop == 'flex') {
lostColumnFlexbox = 'flex';
}

if (lostColumnFlexbox === 'flex') {
decl.cloneBefore({
prop: 'flex',
value: '0 0 auto'
decl.remove();
}
});

if (lostColumnCycle !== 0) {
if (lostColumnFlexbox === 'flex') {
decl.cloneBefore({
prop: 'flex',
value: '0 0 auto'
});

if (lostColumnCycle !== 0) {
newBlock(
decl,
':nth-child('+ lostColumnCycle +'n)',
['margin-right'],
[0]
);
}

newBlock(
decl,
':nth-child('+ lostColumnCycle +'n)',
':last-child',
['margin-right'],
[0]
);
}

newBlock(
decl,
':last-child',
['margin-right'],
[0]
);

newBlock(
decl,
':nth-child(n)',
['margin-right'],
[lostColumnGutter]
);
} else {

if (lostColumnCycle !== 0) {
newBlock(
decl,
':nth-child('+ lostColumnCycle +'n + 1)',
['clear'],
['left']
':nth-child(n)',
['margin-right'],
[lostColumnGutter]
);
} else {

if (lostColumnCycle !== 0) {
newBlock(
decl,
':nth-child('+ lostColumnCycle +'n + 1)',
['clear'],
['left']
);

newBlock(
decl,
':nth-child('+ lostColumnCycle +'n)',
['margin-right'],
[0]
);
}

newBlock(
decl,
':nth-child('+ lostColumnCycle +'n)',
':last-child',
['margin-right'],
[0]
);

newBlock(
decl,
':nth-child(n)',
['float', 'margin-right', 'clear'],
['left', lostColumnGutter, 'none']
);
}

if (lostColumnGutter !== '0') {
decl.cloneBefore({
prop: 'width',
value: 'calc(99.99% * '+ lostColumn +' - ('+ lostColumnGutter +' - '+ lostColumnGutter +' * '+ lostColumn +'))'
});
} else {
decl.cloneBefore({
prop: 'width',
value: 'calc(99.999999% * '+ lostColumn +')'
});
}
} else {

decl.cloneBefore({
prop: 'width',
value: 'auto'
});
newBlock(
decl,
':last-child',
['margin-right'],
[0]
':nth-child(1n)',
['float', 'clear', 'margin-right', 'width'],
['none', 'none', 0, 'auto']
);
newBlock(
decl,
':nth-child(1n + 1)',
['float', 'clear', 'margin-right', 'width'],
['none', 'none', 0, 'auto']
);

newBlock(
decl,
':nth-child(n)',
['float', 'margin-right', 'clear'],
['left', lostColumnGutter, 'none']
['float', 'clear', 'margin-right', 'width'],
['none', 'none', 0, 'auto']
);
newBlock(
decl,
':last-child',
['float', 'clear', 'margin-right', 'width'],
['none', 'none', 0, 'auto']
);
}

if (lostColumnGutter !== '0') {
decl.cloneBefore({
prop: 'width',
value: 'calc(99.99% * '+ lostColumn +' - ('+ lostColumnGutter +' - '+ lostColumnGutter +' * '+ lostColumn +'))'
});
} else {
decl.cloneBefore({
prop: 'width',
value: 'calc(99.999999% * '+ lostColumn +')'
});
}

decl.remove();
Expand Down
10 changes: 10 additions & 0 deletions test/lost-column.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,4 +57,14 @@ describe('lost-column', function() {
'a:nth-child(3n) { margin-right: 0; }'
);
});
it('provides none rule', function() {
check(
'a { lost-column: none; }',
'a { width: auto; }\n' +
'a:last-child { float: none; clear: none; margin-right: 0; width: auto; }\n' +
'a:nth-child(n) { float: none; clear: none; margin-right: 0; width: auto; }\n' +
'a:nth-child(1n + 1) { float: none; clear: none; margin-right: 0; width: auto; }\n' +
'a:nth-child(1n) { float: none; clear: none; margin-right: 0; width: auto; }'
);
});
});