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

Merge branch 'stable'

Browse Source 
Conflicts:
	test/fixtures/stylesheets/compass/css/user-interface.css
This commit is contained in:
Chris Eppstein 2011-10-16 11:12:06 -07:00
commit 64c21f6fac
4 changed files with 19 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
frameworks/compass/stylesheets/compass/css3/_user-interface.scss
View File

@ -13,12 +13,7 @@
@mixin user-select($select) { @mixin user-select($select) {
$select: unquote($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, @include experimental(user-select, $select,
not -moz, -webkit, not -o, not -ms, -khtml, official -moz, -webkit, not -o, not -ms, -khtml, official
); );
} }

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

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

6
test/fixtures/stylesheets/compass/css/transition.css vendored
View File

@ -1,12 +1,12 @@
.single-transition-without-delay { .single-transition-without-delay {
-moz-transition: all 0.6s ease-out;
-webkit-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; } transition: all 0.6s ease-out; }
.single-transition-with-delay { .single-transition-with-delay {
-webkit-transition: all 0.6s ease-out; -webkit-transition: all 0.6s ease-out;
-webkit-transition-delay: 0.2s; -webkit-transition-delay: 0.2s;
-webkit-transition: all 0.6s ease-out 0.2s;
-moz-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; } transition: all 0.6s ease-out 0.2s; }

2
test/fixtures/stylesheets/compass/css/user-interface.css vendored
View File

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