github-migration/compass
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't set the display in the box-flex mixin. This makes nested flex boxes annoying. Closes GH-207

Browse Source
This commit is contained in:
Chris Eppstein 2010-10-31 00:55:34 -07:00
parent 55a649fbc5
commit 5dea2be6ac
2 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
frameworks/compass/stylesheets/compass/css3/_box.scss
View File

@ -45,7 +45,6 @@ $default-box-flex: 0 !default;
@include experimental(box-flex, $flex, @include experimental(box-flex, $flex,
-moz, -webkit, not -o, not -ms, not -khtml, official -moz, -webkit, not -o, not -ms, not -khtml, official
); );
display: block;
} }
// Default flex group // Default flex group

18
test/fixtures/stylesheets/compass/css/box.css vendored
View File

@ -12,8 +12,7 @@
.hbox > * { .hbox > * {
-moz-box-flex: 0; -moz-box-flex: 0;
-webkit-box-flex: 0; -webkit-box-flex: 0;
box-flex: 0; box-flex: 0; }
display: block; }
.vbox { .vbox {
display: -moz-box; display: -moz-box;
@ -28,14 +27,12 @@
.vbox > * { .vbox > * {
-moz-box-flex: 0; -moz-box-flex: 0;
-webkit-box-flex: 0; -webkit-box-flex: 0;
box-flex: 0; box-flex: 0; }
display: block; }
.spacer { .spacer {
-moz-box-flex: 1; -moz-box-flex: 1;
-webkit-box-flex: 1; -webkit-box-flex: 1;
box-flex: 1; box-flex: 1; }
display: block; }
.reverse { .reverse {
-moz-box-direction: reverse; -moz-box-direction: reverse;
@ -45,20 +42,17 @@
.box-flex-0 { .box-flex-0 {
-moz-box-flex: 0; -moz-box-flex: 0;
-webkit-box-flex: 0; -webkit-box-flex: 0;
box-flex: 0; box-flex: 0; }
display: block; }
.box-flex-1 { .box-flex-1 {
-moz-box-flex: 1; -moz-box-flex: 1;
-webkit-box-flex: 1; -webkit-box-flex: 1;
box-flex: 1; box-flex: 1; }
display: block; }
.box-flex-2 { .box-flex-2 {
-moz-box-flex: 2; -moz-box-flex: 2;
-webkit-box-flex: 2; -webkit-box-flex: 2;
box-flex: 2; box-flex: 2; }
display: block; }
.box-flex-group-0 { .box-flex-group-0 {
-moz-box-flex-group: 0; -moz-box-flex-group: 0;