Commit Graph
22 Commits
Author SHA1 Message Date
Damien Metzger 4cc99ed9b6 // more image fixes 2013-11-20 16:33:34 +01:00
Damien Metzger 2d60a95fc3 // Fixed slider image 2013-11-20 16:32:14 +01:00
Jerome Nadaud 60be5a7989 // themeconfigurator fix 2013-11-18 23:56:19 +01:00
Lucas CERDAN e99332c012 // Pics 2013-11-18 22:55:17 +01:00
Jerome Nadaud b2c656e51a // small font fix 2013-11-18 22:32:33 +01:00
Jerome Nadaud 639a56421a // Themeconfigurator 2013-11-18 22:16:26 +01:00
Jérôme Nadaud fb0118e456 Merge pull request #996 from TMMeilleur/bootstrap
replace new css files location to modules/themeconfigurator/css
2013-11-18 11:53:22 -08:00
Jerome Nadaud f2b5e6de51 // Themeconfigurator and homeslider 2013-11-18 20:49:52 +01:00
Alexander Grosul b6c5cd7c63 replace new css files location to modules/themeconfigurator/css 2013-11-18 20:07:24 +02:00
Jerome Nadaud 57b329ca74 // Remove other fonts 2013-11-18 17:46:05 +01:00
Jerome Nadaud c14b9e619d Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
Conflicts:
	modules/themeconfigurator/themeconfigurator.php
2013-11-18 17:21:41 +01:00
Jerome Nadaud 938ef4fe39 // small fix 2013-11-18 17:12:35 +01:00
rGaillard 5d0b188eed // small fix 2013-11-18 16:19:02 +01:00
Jerome Nadaud 89c9f182b3 // Small fix in live configurator toolbox 2013-11-18 15:35:03 +01:00
Jerome Nadaud 40204ba458 // Live configurator toolbox part 2 2013-11-18 15:04:10 +01:00
Jerome Nadaud 2ba5dc18fd Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
Conflicts:
	modules/themeconfigurator/themeconfigurator.php
2013-11-18 14:49:27 +01:00
Jerome Nadaud 867eef79cc // Add live configurator toolbox - Part 1 2013-11-18 14:39:46 +01:00
rGaillard 68c8e9da57 // move to themeconfigurator 2013-11-16 19:24:03 +01:00
TMMeilleur 0d1c113be1 updates and fixes 14.11.2013 2013-11-14 18:08:05 +02:00
alexey-svistunov 6f5c9044d3 Added changes from eb94b51 TMMeilleur/PrestaShop 2013-11-08 21:00:00 +02:00
Rémi Gaillard 3edaee1313 // themeconfigurator 2013-11-05 19:07:42 +01:00
Rémi Gaillard 65a41a9f7a // theme configurator 2013-11-05 18:49:21 +01:00