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

Merge pull request #447 from nimbupani/msfilter

Browse Source 
Removing -ms-filter as it drives IE9+ crazy. plus existing filter works a
This commit is contained in:
Chris Eppstein 2011-06-28 23:06:26 -07:00
commit b6fef2fae9
5 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Gemfile.lock
View File

@ -7,7 +7,7 @@ GIT
PATH PATH
remote: . remote: .
specs: specs:
compass (0.11.3.b352e8b) compass (0.11.3.461a589)
chunky_png (~> 1.2) chunky_png (~> 1.2)
fssm (>= 0.2.7) fssm (>= 0.2.7)
sass (~> 3.1) sass (~> 3.1)
@ -145,6 +145,7 @@ DEPENDENCIES
livereload livereload
mocha mocha
rails (~> 3.0.0.rc) rails (~> 3.0.0.rc)
rake (= 0.8.7)
rb-fsevent rb-fsevent
rcov rcov
rspec (~> 2.0.0) rspec (~> 2.0.0)

5
frameworks/compass/stylesheets/compass/css3/_images.scss
View File

@ -83,10 +83,7 @@
@mixin filter-gradient($start-color, $end-color, $orientation: vertical) { @mixin filter-gradient($start-color, $end-color, $orientation: vertical) {
@include has-layout; @include has-layout;
$gradient-type: if($orientation == vertical, 0, 1); $gradient-type: if($orientation == vertical, 0, 1);
@if $legacy-support-for-ie8 { @if $legacy-support-for-ie6 or $legacy-support-for-ie7 or $legacy-support-for-ie8 {
-ms-filter: "progid:DXImageTransform.Microsoft.gradient(gradientType=#{$gradient-type}, startColorstr='#{ie-hex-str($start-color)}', endColorstr='#{ie-hex-str($end-color)}')";
}
@if $legacy-support-for-ie6 or $legacy-support-for-ie7 {
filter: progid:DXImageTransform.Microsoft.gradient(gradientType=#{$gradient-type}, startColorstr='#{ie-hex-str($start-color)}', endColorstr='#{ie-hex-str($end-color)}'); filter: progid:DXImageTransform.Microsoft.gradient(gradientType=#{$gradient-type}, startColorstr='#{ie-hex-str($start-color)}', endColorstr='#{ie-hex-str($end-color)}');
} }
} }

5
frameworks/compass/stylesheets/compass/css3/_opacity.scss
View File

@ -6,10 +6,7 @@
// A number between 0 and 1, where 0 is transparent and 1 is opaque. // A number between 0 and 1, where 0 is transparent and 1 is opaque.
@mixin opacity($opacity) { @mixin opacity($opacity) {
@if $legacy-support-for-ie8 { @if $legacy-support-for-ie6 or $legacy-support-for-ie7 or $legacy-support-for-ie8 {
-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=#{round($opacity * 100)})";
}
@if $legacy-support-for-ie6 or $legacy-support-for-ie7 {
filter: unquote("progid:DXImageTransform.Microsoft.Alpha(Opacity=#{round($opacity * 100)})"); filter: unquote("progid:DXImageTransform.Microsoft.Alpha(Opacity=#{round($opacity * 100)})");
} }
opacity: $opacity; opacity: $opacity;

3
test/fixtures/stylesheets/compass/css/gradients.css vendored
View File

@ -565,15 +565,12 @@
.ie-horizontal-filter { .ie-horizontal-filter {
*zoom: 1; *zoom: 1;
-ms-filter: "progid:DXImageTransform.Microsoft.gradient(gradientType=1, startColorstr='#FFFFFFFF', endColorstr='#FF000000')";
filter: progid:DXImageTransform.Microsoft.gradient(gradientType=1, startColorstr='#FFFFFFFF', endColorstr='#FF000000'); } filter: progid:DXImageTransform.Microsoft.gradient(gradientType=1, startColorstr='#FFFFFFFF', endColorstr='#FF000000'); }
.ie-vertical-filter { .ie-vertical-filter {
*zoom: 1; *zoom: 1;
-ms-filter: "progid:DXImageTransform.Microsoft.gradient(gradientType=0, startColorstr='#FFFFFFFF', endColorstr='#FF000000')";
filter: progid:DXImageTransform.Microsoft.gradient(gradientType=0, startColorstr='#FFFFFFFF', endColorstr='#FF000000'); } filter: progid:DXImageTransform.Microsoft.gradient(gradientType=0, startColorstr='#FFFFFFFF', endColorstr='#FF000000'); }
.ie-alpha-filter { .ie-alpha-filter {
*zoom: 1; *zoom: 1;
-ms-filter: "progid:DXImageTransform.Microsoft.gradient(gradientType=0, startColorstr='#FFFFFFFF', endColorstr='#00FFFFFF')";
filter: progid:DXImageTransform.Microsoft.gradient(gradientType=0, startColorstr='#FFFFFFFF', endColorstr='#00FFFFFF'); } filter: progid:DXImageTransform.Microsoft.gradient(gradientType=0, startColorstr='#FFFFFFFF', endColorstr='#00FFFFFF'); }

1
test/fixtures/stylesheets/compass/css/opacity.css vendored
View File

@ -1,4 +1,3 @@
div { div {
-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=20)";
filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=20); filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=20);
opacity: 0.2; } opacity: 0.2; }