From 2eba93858bea02e305c0b0a6e6684b768c724b5e Mon Sep 17 00:00:00 2001 From: Chris Eppstein Date: Fri, 24 Jul 2009 09:05:22 -0700 Subject: [PATCH] [Compass Core] Extract css3 compatibility mixins from the general module to the new compass/utilities/css3 module. If you were explicitly importing compass/utilities/general, compass/utilities/general/inline_block or compass/utilities/general/opacity to access the opacity or inline-block mixins, you'll need to update your imports. --- .../blueprint/stylesheets/blueprint/modules/_buttons.sass | 2 +- frameworks/compass/stylesheets/compass/_utilities.sass | 1 + frameworks/compass/stylesheets/compass/utilities/_css3.sass | 3 +++ frameworks/compass/stylesheets/compass/utilities/_general.sass | 2 -- .../compass/utilities/{general => css3}/_border_radius.sass | 0 .../compass/utilities/{general => css3}/_inline_block.sass | 0 .../compass/utilities/{general => css3}/_opacity.sass | 0 7 files changed, 5 insertions(+), 3 deletions(-) create mode 100644 frameworks/compass/stylesheets/compass/utilities/_css3.sass rename frameworks/compass/stylesheets/compass/utilities/{general => css3}/_border_radius.sass (100%) rename frameworks/compass/stylesheets/compass/utilities/{general => css3}/_inline_block.sass (100%) rename frameworks/compass/stylesheets/compass/utilities/{general => css3}/_opacity.sass (100%) diff --git a/frameworks/blueprint/stylesheets/blueprint/modules/_buttons.sass b/frameworks/blueprint/stylesheets/blueprint/modules/_buttons.sass index a59338a3..a82e672e 100644 --- a/frameworks/blueprint/stylesheets/blueprint/modules/_buttons.sass +++ b/frameworks/blueprint/stylesheets/blueprint/modules/_buttons.sass @@ -1,4 +1,4 @@ -@import compass/utilities/general/inline_block.sass +@import compass/utilities/css3/inline_block.sass @import compass/utilities/general/float.sass // Button Font diff --git a/frameworks/compass/stylesheets/compass/_utilities.sass b/frameworks/compass/stylesheets/compass/_utilities.sass index 767001d5..ba76cf7b 100644 --- a/frameworks/compass/stylesheets/compass/_utilities.sass +++ b/frameworks/compass/stylesheets/compass/_utilities.sass @@ -1,3 +1,4 @@ +@import utilities/css3.sass @import utilities/general.sass @import utilities/links.sass @import utilities/lists.sass diff --git a/frameworks/compass/stylesheets/compass/utilities/_css3.sass b/frameworks/compass/stylesheets/compass/utilities/_css3.sass new file mode 100644 index 00000000..45174ab9 --- /dev/null +++ b/frameworks/compass/stylesheets/compass/utilities/_css3.sass @@ -0,0 +1,3 @@ +@import css3/border_radius.sass +@import css3/inline_block.sass +@import css3/opacity.sass diff --git a/frameworks/compass/stylesheets/compass/utilities/_general.sass b/frameworks/compass/stylesheets/compass/utilities/_general.sass index 8e593fec..3b105f8a 100644 --- a/frameworks/compass/stylesheets/compass/utilities/_general.sass +++ b/frameworks/compass/stylesheets/compass/utilities/_general.sass @@ -2,6 +2,4 @@ @import general/clearfix.sass @import general/float.sass @import general/tag_cloud.sass -@import general/inline_block.sass @import general/hacks.sass -@import general/opacity.sass \ No newline at end of file diff --git a/frameworks/compass/stylesheets/compass/utilities/general/_border_radius.sass b/frameworks/compass/stylesheets/compass/utilities/css3/_border_radius.sass similarity index 100% rename from frameworks/compass/stylesheets/compass/utilities/general/_border_radius.sass rename to frameworks/compass/stylesheets/compass/utilities/css3/_border_radius.sass diff --git a/frameworks/compass/stylesheets/compass/utilities/general/_inline_block.sass b/frameworks/compass/stylesheets/compass/utilities/css3/_inline_block.sass similarity index 100% rename from frameworks/compass/stylesheets/compass/utilities/general/_inline_block.sass rename to frameworks/compass/stylesheets/compass/utilities/css3/_inline_block.sass diff --git a/frameworks/compass/stylesheets/compass/utilities/general/_opacity.sass b/frameworks/compass/stylesheets/compass/utilities/css3/_opacity.sass similarity index 100% rename from frameworks/compass/stylesheets/compass/utilities/general/_opacity.sass rename to frameworks/compass/stylesheets/compass/utilities/css3/_opacity.sass