diff --git a/bower.json b/bower.json index e603872..4355379 100644 --- a/bower.json +++ b/bower.json @@ -1,6 +1,6 @@ { "name": "compass-mixins", - "version": "0.12.2", + "version": "0.12.3", "authors": [ "Guillaume Balaine " ], diff --git a/lib/_animate.scss b/lib/_animate.scss new file mode 100644 index 0000000..9a7872d --- /dev/null +++ b/lib/_animate.scss @@ -0,0 +1 @@ +@import "animation"; diff --git a/lib/_compass.scss b/lib/_compass.scss index 812a0cf..9b741c0 100644 --- a/lib/_compass.scss +++ b/lib/_compass.scss @@ -1,4 +1,3 @@ @import "compass/utilities"; @import "compass/typography"; @import "compass/css3"; -@import "animation"; diff --git a/lib/compass/_css3.scss b/lib/compass/_css3.scss index a4aaf73..c0c9fcc 100644 --- a/lib/compass/_css3.scss +++ b/lib/compass/_css3.scss @@ -17,4 +17,3 @@ @import "css3/regions"; @import "css3/hyphenation"; @import "css3/filter"; -@import "css3/user-interface"; diff --git a/lib/compass/css3/_appearance.scss b/lib/compass/css3/_appearance.scss index c6e6533..e238f01 100644 --- a/lib/compass/css3/_appearance.scss +++ b/lib/compass/css3/_appearance.scss @@ -4,10 +4,9 @@ // The appearance property is currently not present in any newer CSS specification. // // There is no official list of accepted values, but you might check these source: -// -// * [Mozilla](https://developer.mozilla.org/en/CSS/-moz-appearance) -// * [Webkit](http://code.google.com/p/webkit-mirror/source/browse/Source/WebCore/css/CSSValueKeywords.in?spec=svnf1aea559dcd025a8946aa7da6e4e8306f5c1b604&r=63c7d1af44430b314233fea342c3ddb2a052e365) -// (search for 'appearance' within the page) +// Mozilla : https://developer.mozilla.org/en/CSS/-moz-appearance +// Webkit : http://code.google.com/p/webkit-mirror/source/browse/Source/WebCore/css/CSSValueKeywords.in?spec=svnf1aea559dcd025a8946aa7da6e4e8306f5c1b604&r=63c7d1af44430b314233fea342c3ddb2a052e365 +// (search for 'appearance' within the page) @mixin appearance($ap) { $ap: unquote($ap); diff --git a/lib/compass/css3/_box.scss b/lib/compass/css3/_box.scss index 2abeef3..959ccff 100644 --- a/lib/compass/css3/_box.scss +++ b/lib/compass/css3/_box.scss @@ -64,7 +64,7 @@ $default-box-ordinal-group: 1 !default; // mixin which takes an int argument for ordinal grouping and rearranging the order @mixin box-ordinal-group( - $group: $default-box-ordinal-group + $group: $default-ordinal-flex-group ) { @include experimental(box-ordinal-group, $group, -moz, -webkit, not -o, -ms, not -khtml, official @@ -108,4 +108,4 @@ $default-box-pack: start !default; @include experimental(box-pack, $pack, -moz, -webkit, not -o, -ms, not -khtml, official ); -} +} \ No newline at end of file diff --git a/lib/compass/css3/_columns.scss b/lib/compass/css3/_columns.scss index dc79517..9af9982 100644 --- a/lib/compass/css3/_columns.scss +++ b/lib/compass/css3/_columns.scss @@ -32,15 +32,6 @@ ); } -// Specify how many columns an element should span across. -// -// * legal values are 1, all -@mixin column-span($columns) { - @include experimental(column-span, $columns, - -moz, -webkit, -o, -ms, not -khtml, official - ); -} - // Specify the width of the rule between columns e.g. `1px` @mixin column-rule-width($width) { @include experimental(column-rule-width, $width, diff --git a/lib/compass/css3/_font-face.scss b/lib/compass/css3/_font-face.scss index f2a0ecd..bd3db34 100644 --- a/lib/compass/css3/_font-face.scss +++ b/lib/compass/css3/_font-face.scss @@ -16,7 +16,7 @@ // [font generator](http://www.fontsquirrel.com/fontface/generator) // -// In order to refer to a specific style of the font in your stylesheets as +// In order to refer to a specific style of the font in your stylesheets as // e.g. "font-style: italic;", you may add a couple of @font-face includes // containing the respective font files for each style and specying // respective the $style parameter. @@ -24,8 +24,8 @@ // Order of the includes matters, and it is: normal, bold, italic, bold+italic. @mixin font-face( - $name, - $font-files, + $name, + $font-files, $eot: false, $weight: false, $style: false @@ -35,7 +35,7 @@ font-family: quote($name); @if $eot { src: font-url($eot); - $font-files: font-url($iefont) unquote("format('embedded-opentype')"), $font-files; + $font-files: font-url($iefont) unquote("format('eot')"), $font-files; } src: $font-files; @if $weight { diff --git a/lib/compass/css3/_images.scss b/lib/compass/css3/_images.scss index 18cdc16..8d2337d 100644 --- a/lib/compass/css3/_images.scss +++ b/lib/compass/css3/_images.scss @@ -1,5 +1,5 @@ @import "shared"; -@import "../utilities/general/hacks"; +@import "../../utilities/general/hacks"; // Background property support for vendor prefixing within values. @mixin background( diff --git a/lib/compass/typography/lists/_horizontal-list.scss b/lib/compass/typography/lists/_horizontal-list.scss index 58d3778..b66e4c0 100644 --- a/lib/compass/typography/lists/_horizontal-list.scss +++ b/lib/compass/typography/lists/_horizontal-list.scss @@ -31,7 +31,7 @@ // // :last-child is not fully supported // see http://www.quirksmode.org/css/contents.html#t29 for the support matrix -// +// // IE8 ignores rules that are included on the same line as :last-child // see http://www.richardscarrott.co.uk/posts/view/ie8-last-child-bug for details // diff --git a/lib/compass/typography/lists/_inline-block-list.scss b/lib/compass/typography/lists/_inline-block-list.scss index a738f57..ea031dc 100644 --- a/lib/compass/typography/lists/_inline-block-list.scss +++ b/lib/compass/typography/lists/_inline-block-list.scss @@ -39,7 +39,7 @@ padding: { left: $padding; right: $padding; - }; + }; } } diff --git a/lib/compass/typography/text/_ellipsis.scss b/lib/compass/typography/text/_ellipsis.scss index 0cbcda7..d380afb 100644 --- a/lib/compass/typography/text/_ellipsis.scss +++ b/lib/compass/typography/text/_ellipsis.scss @@ -20,6 +20,6 @@ $use-mozilla-ellipsis-binding: false !default; official ); @if $experimental-support-for-mozilla and $use-mozilla-ellipsis-binding { - -moz-binding: stylesheet-url(unquote("xml/ellipsis.xml#ellipsis")); + -moz-binding: stylesheet-url(unquote("xml/ellipsis.xml#ellipsis")); } } diff --git a/lib/compass/utilities/general/_reset.scss b/lib/compass/utilities/general/_reset.scss index c51915f..058c8a1 100644 --- a/lib/compass/utilities/general/_reset.scss +++ b/lib/compass/utilities/general/_reset.scss @@ -1,2 +1,2 @@ // This module has moved. -@import "../../reset/utilities"; \ No newline at end of file +@import "../../reset/utilities";