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

Conflicts: admin-dev/themes/default/css/admin-theme.css
2013-10-09 18:55:46 +02:00
parent 74f12c23be 079534f039
commit 719e5f4faf
8 changed files with 370 additions and 274 deletions
@@ -165,6 +165,8 @@ html, body
 		text-transform: uppercase
 		@media (max-width: $screen-tablet)
 			padding: 0 0 0 20px
+	a
+		color: white
 	.btn-toolbar
 		margin: 0
 		padding: 3px 0 0 0