Merge with 04646c75a71729ef8d0f0b28d2070a7ef6ca311a
authorcavaliet
Thu, 27 Jun 2013 12:53:03 +0200
changeset 169 a548017794a1
parent 168 c90576d18319 (current diff)
parent 167 04646c75a717 (diff)
child 170 ed256af483f4
Merge with 04646c75a71729ef8d0f0b28d2070a7ef6ca311a
--- a/integration/v2/css/style.css	Thu Jun 27 12:51:32 2013 +0200
+++ b/integration/v2/css/style.css	Thu Jun 27 12:53:03 2013 +0200
@@ -153,7 +153,7 @@
 .tool.cut{background-position: -86px 0;}
 .tool.save{background-position: -144px 0;}
 .tool.trash{background-position: -117px 0;}
-
+.tool.edit{background-position:-174px 0;}
 
 .box-shadow{ -webkit-box-shadow: 1px 1px 5px rgba(50, 50, 50, 0.75);-moz-box-shadow: 1px 1px 5px rgba(50, 50, 50, 0.75);box-shadow: 1px 1px 5px rgba(50, 50, 50, 0.75);}
 .box-shadow-2{ -webkit-box-shadow: 1px 1px 2px rgba(50, 50, 50, 0.75);-moz-box-shadow: 1px 1px 2px rgba(50, 50, 50, 0.75);box-shadow: 1px 1px 2px rgba(50, 50, 50, 0.75);}
Binary file integration/v2/img/tools-sprite.png has changed