diff --git a/VERSION.yml b/VERSION.yml index 99382bed..ab224831 100644 --- a/VERSION.yml +++ b/VERSION.yml @@ -1,5 +1,5 @@ --- :major: 0 :minor: 11 -:build: 1 +:build: 2 :name: Antares diff --git a/doc-src/content/CHANGELOG.markdown b/doc-src/content/CHANGELOG.markdown index 218c8b5e..a8c18baa 100644 --- a/doc-src/content/CHANGELOG.markdown +++ b/doc-src/content/CHANGELOG.markdown @@ -14,16 +14,13 @@ The Documentation for the [latest stable release](http://compass-style.org/docs/ The Documentation for the [latest preview release](http://beta.compass-style.org/) -0.11.3 (PENDING) +0.11.2 (06/10/2011) ------------------- -* Sprites will now by default remove any old versions of the sprite a new variable has been created to override this. +* Sprites will now by default remove any old versions of the sprite. A new configuration + variable has been created to override this. * Nested sprites are now supported using globs `@import 'nested/**/*.png';`. * Fixed a bug that was causing sprite variable options to not get passed to the image classes. * Sass Colors will no longer cause an error if you use them as sprite names. - -0.11.2 (05/01/2011) -------------------- - * Added support for -ms gradients in background-image and background properties * Give a better error if Sass::Script::Functions.declare does not exist. diff --git a/doc-src/content/help/tutorials/integration.markdown b/doc-src/content/help/tutorials/integration.markdown index daac952b..4b0d8fd8 100644 --- a/doc-src/content/help/tutorials/integration.markdown +++ b/doc-src/content/help/tutorials/integration.markdown @@ -1,7 +1,7 @@ --- title: Application Integration layout: tutorial -crumb: Appliction Integration +crumb: Application Integration classnames: - tutorial --- diff --git a/doc-src/content/stylesheets/partials/_typography.scss b/doc-src/content/stylesheets/partials/_typography.scss index fe85f130..3e70c53a 100644 --- a/doc-src/content/stylesheets/partials/_typography.scss +++ b/doc-src/content/stylesheets/partials/_typography.scss @@ -29,7 +29,8 @@ ul { list-style: none; margin-bottom: 1em;} h2 { line-height: 1.3em; margin-top: 0; padding-top: 3px;} } -em { font-style: italic; } +em { font-style: italic; } +strong { font-weight: bold; } #page > article { ul ul { padding-left: 1em; } diff --git a/frameworks/compass/stylesheets/compass/css3/_box.scss b/frameworks/compass/stylesheets/compass/css3/_box.scss index c7c881d1..959ccff9 100644 --- a/frameworks/compass/stylesheets/compass/css3/_box.scss +++ b/frameworks/compass/stylesheets/compass/css3/_box.scss @@ -3,7 +3,7 @@ // display:box; must be used for any of the other flexbox mixins to work properly @mixin display-box { @include experimental-value(display, box, - -moz, -webkit, not -o, not -ms, not -khtml, official + -moz, -webkit, not -o, -ms, not -khtml, official ); } @@ -16,7 +16,7 @@ $default-box-orient: horizontal !default; ) { $orientation : unquote($orientation); @include experimental(box-orient, $orientation, - -moz, -webkit, not -o, not -ms, not -khtml, official + -moz, -webkit, not -o, -ms, not -khtml, official ); } @@ -29,7 +29,7 @@ $default-box-align: stretch !default; ) { $alignment : unquote($alignment); @include experimental(box-align, $alignment, - -moz, -webkit, not -o, not -ms, not -khtml, official + -moz, -webkit, not -o, -ms, not -khtml, official ); } @@ -43,7 +43,7 @@ $default-box-flex: 0 !default; $flex: $default-box-flex ) { @include experimental(box-flex, $flex, - -moz, -webkit, not -o, not -ms, not -khtml, official + -moz, -webkit, not -o, -ms, not -khtml, official ); } @@ -55,7 +55,7 @@ $default-box-flex-group: 1 !default; $group: $default-box-flex-group ) { @include experimental(box-flex-group, $group, - -moz, -webkit, not -o, not -ms, not -khtml, official + -moz, -webkit, not -o, -ms, not -khtml, official ); } @@ -67,7 +67,7 @@ $default-box-ordinal-group: 1 !default; $group: $default-ordinal-flex-group ) { @include experimental(box-ordinal-group, $group, - -moz, -webkit, not -o, not -ms, not -khtml, official + -moz, -webkit, not -o, -ms, not -khtml, official ); } @@ -80,7 +80,7 @@ $default-box-direction: normal !default; ) { $direction: unquote($direction); @include experimental(box-direction, $direction, - -moz, -webkit, not -o, not -ms, not -khtml, official + -moz, -webkit, not -o, -ms, not -khtml, official ); } @@ -93,7 +93,7 @@ $default-box-lines: single !default; ) { $lines: unquote($lines); @include experimental(box-lines, $lines, - -moz, -webkit, not -o, not -ms, not -khtml, official + -moz, -webkit, not -o, -ms, not -khtml, official ); } @@ -106,6 +106,6 @@ $default-box-pack: start !default; ) { $pack: unquote($pack); @include experimental(box-pack, $pack, - -moz, -webkit, not -o, not -ms, not -khtml, official + -moz, -webkit, not -o, -ms, not -khtml, official ); } \ No newline at end of file diff --git a/test/fixtures/stylesheets/compass/css/box.css b/test/fixtures/stylesheets/compass/css/box.css index a191b2c1..9c1cdc9d 100644 --- a/test/fixtures/stylesheets/compass/css/box.css +++ b/test/fixtures/stylesheets/compass/css/box.css @@ -1,84 +1,103 @@ .hbox { display: -moz-box; display: -webkit-box; + display: -ms-box; display: box; -moz-box-orient: horizontal; -webkit-box-orient: horizontal; + -ms-box-orient: horizontal; box-orient: horizontal; -moz-box-align: stretch; -webkit-box-align: stretch; + -ms-box-align: stretch; box-align: stretch; } .hbox > * { -moz-box-flex: 0; -webkit-box-flex: 0; + -ms-box-flex: 0; box-flex: 0; } .vbox { display: -moz-box; display: -webkit-box; + display: -ms-box; display: box; -moz-box-orient: vertical; -webkit-box-orient: vertical; + -ms-box-orient: vertical; box-orient: vertical; -moz-box-align: stretch; -webkit-box-align: stretch; + -ms-box-align: stretch; box-align: stretch; } .vbox > * { -moz-box-flex: 0; -webkit-box-flex: 0; + -ms-box-flex: 0; box-flex: 0; } .spacer { -moz-box-flex: 1; -webkit-box-flex: 1; + -ms-box-flex: 1; box-flex: 1; } .reverse { -moz-box-direction: reverse; -webkit-box-direction: reverse; + -ms-box-direction: reverse; box-direction: reverse; } .box-flex-0 { -moz-box-flex: 0; -webkit-box-flex: 0; + -ms-box-flex: 0; box-flex: 0; } .box-flex-1 { -moz-box-flex: 1; -webkit-box-flex: 1; + -ms-box-flex: 1; box-flex: 1; } .box-flex-2 { -moz-box-flex: 2; -webkit-box-flex: 2; + -ms-box-flex: 2; box-flex: 2; } .box-flex-group-0 { -moz-box-flex-group: 0; -webkit-box-flex-group: 0; + -ms-box-flex-group: 0; box-flex-group: 0; } .box-flex-group-1 { -moz-box-flex-group: 1; -webkit-box-flex-group: 1; + -ms-box-flex-group: 1; box-flex-group: 1; } .box-flex-group-2 { -moz-box-flex-group: 2; -webkit-box-flex-group: 2; + -ms-box-flex-group: 2; box-flex-group: 2; } .start { -moz-box-pack: start; -webkit-box-pack: start; + -ms-box-pack: start; box-pack: start; } .end { -moz-box-pack: end; -webkit-box-pack: end; + -ms-box-pack: end; box-pack: end; } .center { -moz-box-pack: center; -webkit-box-pack: center; + -ms-box-pack: center; box-pack: center; }