Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap

Conflicts: admin-dev/themes/default/css/admin-theme.css
2013-11-05 16:42:09 +01:00
parent 533ebc0f6d 4a6cb5075e
commit e702af6a67
86 changed files with 2924 additions and 838 deletions
@@ -66,6 +66,7 @@
 		@include box-shadow(rgba(0,0,0,0.2) 0 1px 3px inset)
 		border: solid 1px #ccc
 		background-color: #eee
+		cursor: n-resize
 .module_col_icon
 	display: table-cell
 	width: 50px