69 Commits

Author SHA1 Message Date
Marion Muszynski
83ac3dbe3f fix conflcit 2016-06-01 12:45:33 +02:00
Marion Muszynski
d59e49e3ba update scrollbar color and more 2016-06-01 12:43:12 +02:00
Marion Muszynski
aeb00544fb Merge branch 'tiket-productTemplate' into develop 2016-05-30 18:07:07 +02:00
Marion Muszynski
cd56c49c48 modif css 2016-05-30 18:06:19 +02:00
Marion Muszynski
6c1d54467b Merge branch 'ticket-fidelite' into develop 2016-05-30 17:52:52 +02:00
Marion Muszynski
725251f138 fix css 2016-05-30 17:52:18 +02:00
Marion Muszynski
df3661299e Merge branch 'ticket-fidelite' into develop 2016-05-30 17:46:30 +02:00
Marion Muszynski
ed698c66f8 modif css 2016-05-30 17:45:51 +02:00
Marion Muszynski
66171d1e76 Merge branch 'ticket-fidelite' into develop 2016-05-30 17:42:05 +02:00
Marion Muszynski
0cf8ac97a9 modif css 2016-05-30 17:41:17 +02:00
Marion Muszynski
c9265f1116 Merge branch 'tiket-productTemplate' into develop 2016-05-30 12:07:47 +02:00
Marion Muszynski
a4ad9d98b0 modif tpl product css 2016-05-30 12:07:24 +02:00
Marion Muszynski
1af459d215 Merge branch 'tiket-productTemplate' into develop 2016-05-26 14:36:00 +02:00
Marion Muszynski
122cea0bc5 modif img product 2016-05-26 14:35:35 +02:00
Marion Muszynski
bee4986a9f Merge branch 'tiket-productTemplate' into develop 2016-05-20 15:02:56 +02:00
Marion Muszynski
f479a0f9a7 modif css 2016-05-20 15:02:22 +02:00
Marion Muszynski
da375df311 Merge branch 'tiket-productTemplate' into develop 2016-05-20 12:38:50 +02:00
Marion Muszynski
a356edf0df modif picto 2016-05-20 12:38:25 +02:00
Marion Muszynski
5c6f243d6b fix conflict 2016-05-19 13:17:54 +02:00
Marion Muszynski
1cb1c7398e fix conflict css 2016-05-17 15:57:59 +02:00
Marion Muszynski
b7f247729f modif tpl carrier et css 2016-05-17 15:56:27 +02:00
Marion Muszynski
44829771cf fix conflict css 2016-05-13 13:33:44 +02:00
Marion Muszynski
7e7feb5a52 ajust css and opti restrict addresses 2016-05-13 13:31:50 +02:00
Srv Bebeboutik
1fef6beb19 modif css site et mobile 2016-05-13 11:41:40 +02:00
Marion Muszynski
56683972c7 Merge branch 'tiket-productTemplate' into develop 2016-05-10 16:14:11 +02:00
Marion Muszynski
183ad376d0 modif for delay flag 2016-05-10 16:13:48 +02:00
Marion Muszynski
944fe22c8d Merge branch 'tiket-productTemplate' into develop 2016-05-04 16:20:10 +02:00
Marion Muszynski
8e8e2793ae modif arroaw slider 2016-05-04 16:19:18 +02:00
Marion Muszynski
d54abebb29 Merge branch 'tiket-productTemplate' into develop 2016-05-04 15:37:03 +02:00
Marion Muszynski
231dbe444e modif css 2016-05-04 15:36:41 +02:00
Marion Muszynski
de66d55c55 Merge branch 'tiket-productTemplate' into develop 2016-05-04 15:31:51 +02:00
Marion Muszynski
402ac44f49 slider blockbestsellers in product page 2016-05-04 15:31:28 +02:00
Marion Muszynski
b88d79c1cc Merge branch 'ticket-fidelite' into develop 2016-05-03 15:58:00 +02:00
Marion Muszynski
c8fb4bf96b petite modif 2016-05-03 15:57:35 +02:00
Marion Muszynski
2a10c6a2fe fix conflict in css 2016-05-03 15:40:01 +02:00
Marion Muszynski
63db0cc73c adding in blocuserinfo 2016-05-03 15:38:20 +02:00
Marion Muszynski
e69dd75074 Merge branch 'tiket-productTemplate' into develop 2016-05-02 17:49:43 +02:00
Marion Muszynski
77f391e66d Merge branch 'ticket-fidelite' into develop 2016-05-02 17:48:42 +02:00
Marion Muszynski
bf39d6aa82 modif css 2016-05-02 17:48:16 +02:00
Marion Muszynski
388a6bfc10 modif css 2016-05-02 17:46:53 +02:00
Marion Muszynski
f1a4d79daf Merge branch 'tiket-productTemplate' into develop 2016-05-02 17:20:51 +02:00
Marion Muszynski
990ddefe16 border radius add to cart 2016-05-02 17:20:18 +02:00
Marion Muszynski
5da6bd1c3f Merge branch 'tiket-productTemplate' into develop 2016-04-29 16:04:45 +02:00
Marion Muszynski
f4597e397e modif flag expe in product tpl 2016-04-29 16:04:17 +02:00
Marion Muszynski
95b51d3389 fix conflict css 2016-04-27 16:13:54 +02:00
Marion Muszynski
2a160422d9 adding desc more for product 2016-04-27 16:11:19 +02:00
Marion Muszynski
b3e4aa78ab Merge branch 'tiket-productTemplate' into develop 2016-04-26 17:06:40 +02:00
Marion Muszynski
20beed5ed7 modif css 2016-04-26 17:06:16 +02:00
Marion Muszynski
3a5edf328a Merge branch 'tiket-productTemplate' into develop 2016-04-26 17:02:11 +02:00
Marion Muszynski
2217bf5414 modif tpl 2016-04-26 17:01:44 +02:00