From 02029b1006a212494eb1806091ffd0520c63a596 Mon Sep 17 00:00:00 2001 From: "J. Danse" Date: Sat, 19 Oct 2013 13:11:39 +0200 Subject: [PATCH 1/3] //ignore .bak --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 46ab7e014..a80c2b667 100644 --- a/.gitignore +++ b/.gitignore @@ -6,6 +6,7 @@ .svn .DS_Store .sass-cache +.bak robots.txt sitemap.xml cache/cachefs/* From 6633f40a7a95b8bb7fff14d319b3c8e40efe7263 Mon Sep 17 00:00:00 2001 From: PrestaEdit Date: Sat, 19 Oct 2013 17:21:46 +0200 Subject: [PATCH 2/3] // .bak --- .gitignore | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitignore b/.gitignore index a80c2b667..46ab7e014 100644 --- a/.gitignore +++ b/.gitignore @@ -6,7 +6,6 @@ .svn .DS_Store .sass-cache -.bak robots.txt sitemap.xml cache/cachefs/* From 9f396ada83934686c97434f42f70b212c3788328 Mon Sep 17 00:00:00 2001 From: Jonathan Danse Date: Tue, 5 Nov 2013 10:13:13 +0100 Subject: [PATCH 3/3] //remove unnecessary addCSS (fancybox) --- classes/controller/FrontController.php | 1 - controllers/admin/AdminImportController.php | 1 - controllers/front/ProductController.php | 1 - 3 files changed, 3 deletions(-) diff --git a/classes/controller/FrontController.php b/classes/controller/FrontController.php index b319af9ba..382646327 100644 --- a/classes/controller/FrontController.php +++ b/classes/controller/FrontController.php @@ -742,7 +742,6 @@ class FrontControllerCore extends Controller $this->addJqueryUI('ui.sortable'); $this->addjqueryPlugin('fancybox'); $this->addJS(_PS_JS_DIR_.'hookLiveEdit.js'); - $this->addCSS(_PS_CSS_DIR_.'jquery.fancybox-1.3.4.css', 'all'); // @TODO } if ($this->context->language->is_rtl) $this->addCSS(_THEME_CSS_DIR_.'rtl.css'); diff --git a/controllers/admin/AdminImportController.php b/controllers/admin/AdminImportController.php index 3fcb49bbc..997a71a22 100644 --- a/controllers/admin/AdminImportController.php +++ b/controllers/admin/AdminImportController.php @@ -488,7 +488,6 @@ class AdminImportControllerCore extends AdminController $this->toolbar_btn = array(); // adds fancybox - $this->addCSS(_PS_CSS_DIR_.'jquery.fancybox-1.3.4.css', 'screen'); $this->addJqueryPlugin(array('fancybox')); $entity_selected = 0; diff --git a/controllers/front/ProductController.php b/controllers/front/ProductController.php index c082654f9..8e7092fd6 100644 --- a/controllers/front/ProductController.php +++ b/controllers/front/ProductController.php @@ -46,7 +46,6 @@ class ProductControllerCore extends FrontController if ($this->context->getMobileDevice() == false) { $this->addCSS(_THEME_CSS_DIR_.'product.css'); - $this->addCSS(_PS_CSS_DIR_.'jquery.fancybox-1.3.4.css', 'screen'); $this->addJqueryPlugin(array('fancybox', 'idTabs', 'scrollTo', 'serialScroll')); $this->addJS(array( _THEME_JS_DIR_.'tools.js',