dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
18,057 Commits 9 Branches 19 Tags
bootstrap
Commit Graph

211 Commits

Author SHA1 Message Date
Kevin Granger
84a0f9489c // add submenu shadow + allow html for tooltip 2013-08-30 17:39:37 +02:00
Kevin Granger
d4023ce0a3 // config Compass + Bower Update 2013-08-30 15:18:20 +02:00
Kevin Granger
0c494912a4 // BO fix product tabs 2013-08-30 11:51:57 +02:00
Kevin Granger
e4d58b7528 // submenu .active link 2013-08-30 11:13:28 +02:00
Kevin Granger
357c949faf // opti css menu 2013-08-29 18:54:36 +02:00
Kevin Granger
c07f226dd4 // fix dashboard gfx 2013-08-29 16:17:40 +02:00
Kevin Granger
618d980dc7 [+] add css for graph and temp avatar 2013-08-29 15:48:14 +02:00
Kevin Granger
8660a24d55 [+] Dashboard Markup WIP 2013-08-28 19:26:19 +02:00
Kevin Granger
ecb4d65347 // list toolbar 2013-08-28 10:06:52 +02:00
Kevin Granger
4c92db8912 // Modules position 2013-08-27 19:08:53 +02:00
Kevin Granger
9129ee79dc // Modules position WIP 2013-08-27 18:54:57 +02:00
Kevin Granger
b2f0a8aea9 // fix switch + ignore bower_components 2013-08-21 19:28:32 +02:00
Kevin Granger
3f8649b6b4 // cleaning components + fix form input, switch 2013-08-21 19:16:04 +02:00
Kevin Granger
93e03a3c3b // update bower with latest bootstrap 3.0.0 + fix layout 2013-08-21 17:17:24 +02:00
Kevin Granger
44655ecdef // breaking things 2013-08-20 16:38:31 +02:00
Kevin Granger
d3717f0950 // fix some test with colors & fix for login screen 2013-08-09 18:57:22 +02:00
Kevin Granger
bca29980d5 //fix layout and contrasted colors 2013-08-09 15:08:14 +02:00
Kevin Granger
6ae222e720 // some sass/compass magic for color schemes… and few new bugs to fix with layout 2013-08-08 16:59:39 +02:00
Kevin Granger
ff16de05de // fix, design and fun ! 2013-08-06 19:06:56 +02:00
Kevin Granger
58cba9f894 // [+] Module - Login Addons 2013-08-06 10:19:43 +02:00
Kevin Granger
bdc9d77c09 // Module List + some design WIP 2013-08-05 20:42:14 +02:00
Kevin Granger
9f11ecfd78 // Add label attributes for, refacto browse file 2013-08-02 18:46:37 +02:00
Kevin Granger
e4878ba393 // I'm not sure as I've never had a look at how that works before ;) 2013-07-31 21:17:03 +02:00
Kevin Granger
a1cc4d14d0 [+] BO Customers > Customers / Customers > Groups 2013-07-30 18:47:13 +02:00
Kevin Granger
d95a519ace [+] BO Customers WIP 2013-07-29 19:18:02 +02:00
Kevin Granger
9f9c0ef416 [+] BO Orders 2013-07-26 18:54:28 +02:00
Kevin Granger
1a2b78b00f [+] BO Invoices 2013-07-26 15:34:11 +02:00
Kevin Granger
9308c5c527 no message 2013-07-25 19:18:54 +02:00
Kevin Granger
edc2113330 // fix merge 2013-07-24 17:02:23 +02:00
Kevin Granger
77f80b1774 // Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap 
Conflicts:
	.gitignore
	admin-dev/themes/default/css/admin.css
	admin-dev/themes/default/template/controllers/categories/helpers/list/list_header.tpl
	admin-dev/themes/default/template/controllers/customers/helpers/list/list_header.tpl
	admin-dev/themes/default/template/controllers/modules/list.tpl
	admin-dev/themes/default/template/controllers/modules/page.tpl
	admin-dev/themes/default/template/controllers/modules/tab_module_line.tpl
	admin-dev/themes/default/template/controllers/orders/_documents.tpl
	admin-dev/themes/default/template/controllers/orders/_shipping.tpl
	admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/payment/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/payment/restrictions.tpl
	admin-dev/themes/default/template/controllers/products/images.tpl
	admin-dev/themes/default/template/controllers/products/informations.tpl
	admin-dev/themes/default/template/header.tpl
	admin-dev/themes/default/template/helpers/form/form.tpl
	admin-dev/themes/default/template/helpers/modules_list/list.tpl
	classes/Tools.php
	controllers/admin/AdminCartRulesController.php
	controllers/admin/AdminProductsController.php
	css/admin.css
 2013-07-24 17:01:23 +02:00
Kevin Granger
f7d1743c8a // fix tags in helper 2013-07-24 11:42:47 +02:00
Kevin Granger
9d16eb1d1b // BO fix + work on helpers + compass/codekit config 2013-07-22 16:43:16 +02:00
Kevin Granger
288c0d3ca8 // Css cleaning 2013-07-19 18:41:15 +02:00
Kevin Granger
0b4512dbcb // some work on style sheets 2013-07-18 18:51:24 +02:00
Kevin Granger
02921dc9d0 [+] Helper form WIP 2013-07-16 19:23:46 +02:00
Kevin Granger
c12ce3dd29 // Products 2013-07-12 17:27:25 +02:00
Kevin Granger
84c0ccbae6 // products TPL 2013-07-11 18:58:44 +02:00
Kevin Granger
ec466b8c70 // Porting more product tpl 2013-07-09 19:10:56 +02:00
Kevin Granger
1f33638f32 [+] BO Wip BS -> Products + fix 2013-07-05 18:36:42 +02:00
Kevin Granger
0ad4b44866 // Refactor helper list + fixs 2013-07-02 18:55:43 +02:00
Damien Metzger
006e8718f2 // Improved label of IETF language tag 2013-07-01 12:35:32 +02:00
Kevin Granger
d583cf25d2 // Bootstrap3 - Cart_rules > information.tpl + header + Font Awesome + Switch 2013-06-28 19:35:32 +02:00
Kevin Granger
aa8d6d5872 //Porting more components to bootstrap 2013-06-21 17:47:05 +02:00
Kevin Granger
40f03d0ba1 [+] BO: Form components 2013-06-18 21:03:43 +02:00
Damien Metzger
fd0bc675e5 // Fixed display 2013-06-18 15:54:29 +02:00
sLorenzini
c62dc3dc7a [-] BO: fixed bug button on module list 2013-06-18 15:39:48 +02:00
sLorenzini
48db491c2e [-] BO: fixed bug #PSCFV-9463 + improve some css on BO menu 2013-06-18 15:39:46 +02:00
Damien Metzger
c04d2626f5 // Improved module list view 2013-06-18 15:34:58 +02:00
sLorenzini
3daf4cdb99 [-] BO: fixed bug #PSCFV-9461 2013-06-18 14:46:09 +02:00
Kevin Granger
993690801e // Small changes with layout an css 2013-06-17 18:49:45 +02:00