Skip to content

Commit 421273a

Browse files
authored
Merge pull request #145 from outoftime/full-flex
Full support for Flexbox
2 parents 1ffcd79 + 731de14 commit 421273a

3 files changed

Lines changed: 15 additions & 5 deletions

File tree

npm-shrinkwrap.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
"bugs": "https://trello.com/b/ONaFg6wh/popcode",
3030
"license": "MIT",
3131
"dependencies": {
32-
"PrettyCSS": "popcodeorg/PrettyCSS#v0.3.10-popcode.1",
32+
"PrettyCSS": "popcodeorg/PrettyCSS#v0.3.10-popcode.2",
3333
"base64-js": "^1.0.2",
3434
"bowser": "^1.4.1",
3535
"brace": "^0.8.0",

spec/examples/validations/css.spec.js

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,18 @@ function assertFailsCssValidationWith(source, ...errors) {
1919
describe('css', () => {
2020
it('allows valid flexbox', () =>
2121
assertPassesCssValidation(`
22-
.flex-container { display: flex; }
23-
.flex-item { flex: 1 0 auto; }
22+
.flex-container {
23+
display: flex;
24+
flex-flow: nowrap column;
25+
align-content: flex-end;
26+
justify-content: flex-start;
27+
align-items: center;
28+
}
29+
.flex-item {
30+
flex: 1 0 auto;
31+
align-self: flex-end;
32+
order: 2;
33+
}
2434
`)
2535
);
2636

0 commit comments

Comments
 (0)