1
0
Fork 0
mirror of https://github.com/Oreolek/elements.git synced 2024-04-26 22:19:18 +03:00

Merge branch 'master' of git://github.com/collingo/elements

Conflicts:
	elements.less
This commit is contained in:
Alexander Yakovlev 2012-05-26 08:07:05 +07:00
commit f7505132d0

View file

@ -1,3 +1,4 @@
<<<<<<< HEAD
/*! ---------------------------------------------------
LESS Elements 0.6.x
---------------------------------------------------
@ -132,11 +133,20 @@
transform: translate(@x, @y);
}
.opacity(@opacity: 0.5) {
-moz-opacity: @opacity;
-khtml-opacity: @opacity;
-webkit-opacity: @opacity;
opacity: @opacity;
}
@percent: @opacity * 100;
/* IE 8 */
-ms-filter: ~"progid:DXImageTransform.Microsoft.Alpha(opacity=@{percent})";
/* IE 5-7 */
filter: ~"alpha(opacity=@{percent})";
/* Netscape */
-moz-opacity: @opacity;
/* Safari 1.x */
-khtml-opacity: @opacity;
/* Webkit */
-webkit-opacity: @opacity;
/* Good browsers */
opacity: @opacity;
}
}
#transition{