Merge branch 'stable'

Conflicts:
	test/fixtures/stylesheets/compass/css/user-interface.css

frameworks/compass/stylesheets/compass/css3/_user-interface.scss

@@ -13,12 +13,7 @@
 
 @mixin user-select($select) {
   $select: unquote($select);
-  // Mozilla needs prefix on both the -moz-property and the -moz-value
-  @include experimental(user-select, -moz-#{$select},
-    -moz, not -webkit, not -o, not -ms, not -khtml, not official
-  );
-  // others do not
   @include experimental(user-select, $select,
-    not -moz, -webkit, not -o, not -ms, -khtml, official
+    -moz, -webkit, not -o, not -ms, -khtml, official
   );
 }

frameworks/compass/stylesheets/compass/typography/lists/_inline-block-list.scss

@@ -2,18 +2,22 @@
 //
 // Easy mode using simple descendant li selectors:
 //
-//   ul.nav
-//     +inline-block-list
+//     ul.nav {
+//       @import inline-block-list;
+//     }
 //
 // Advanced mode:
 // If you need to target the list items using a different selector then use
-// +inline-block-list-container on your ul/ol and +inline-block-list-item on your li.
-// This may help when working on layouts involving nested lists. For example:
+// `@include inline-block-list-container` on your ul/ol and
+// `@include inline-block-list-item` on your li. This may help when working
+// on layouts involving nested lists. For example:
 //
-//   ul.nav
-//     +inline-block-list-container
-//     > li
-//       +inline-block-list-item
+//     ul.nav {
+//       @include inline-block-list-container;
+//       > li {
+//         @include inline-block-list-item;
+//       }
+//     }
 
 @import "bullets";
 @import "horizontal-list";
@@ -21,13 +25,12 @@
 @import "compass/css3/inline-block";
 
 // Can be mixed into any selector that target a ul or ol that is meant
-// to have an inline-block layout. Used to implement +inline-block-list.
+// to have an inline-block layout. Used to implement `inline-block-list`.
 @mixin inline-block-list-container {
   @include horizontal-list-container; }
 
 // Can be mixed into any li selector that is meant to participate in a horizontal layout.
-// Used to implement +inline-block-list.
-
+// Used to implement `inline-block-list`.
 @mixin inline-block-list-item($padding: false) {
   @include no-bullet;
   @include inline-block;

test/fixtures/stylesheets/compass/css/transition.css

@@ -1,12 +1,12 @@
 .single-transition-without-delay {
-  -moz-transition: all 0.6s ease-out;
   -webkit-transition: all 0.6s ease-out;
-  -o-transition: all 0.6s ease-out;
+  -khtml-transition: all 0.6s ease-out;
+  -moz-transition: all 0.6s ease-out;
   transition: all 0.6s ease-out; }
 
 .single-transition-with-delay {
   -webkit-transition: all 0.6s ease-out;
   -webkit-transition-delay: 0.2s;
+  -webkit-transition: all 0.6s ease-out 0.2s;
   -moz-transition: all 0.6s ease-out 0.2s;
-  -o-transition: all 0.6s ease-out 0.2s;
   transition: all 0.6s ease-out 0.2s; }

test/fixtures/stylesheets/compass/css/user-interface.css

@@ -1,5 +1,5 @@
 .user-select {
-  -webkit-user-select: -moz-none;
+  -webkit-user-select: none;
   -khtml-user-select: none;
   -o-user-select: none;
   user-select: none; }