From 729393d88c21b9d2ac8a1cf857821432df759d0c Mon Sep 17 00:00:00 2001 From: Edin Dazdarevic Date: Mon, 20 Apr 2015 14:12:42 +0200 Subject: [PATCH 1/2] page flickering solved --- front-ui/app/css/main.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/front-ui/app/css/main.css b/front-ui/app/css/main.css index b399ea0..238a4df 100644 --- a/front-ui/app/css/main.css +++ b/front-ui/app/css/main.css @@ -2,6 +2,10 @@ /* site */ +html { + overflow-y: scroll; +} + body{ background: url("https://res.cloudinary.com/du5pdibul/image/upload/v1428813560/bg_prp6pz.jpg") fixed 100% 100% ; background-size: cover ; From e4536055dfaa88b07958e3ec21e5ead249860efc Mon Sep 17 00:00:00 2001 From: Edin Dazdarevic Date: Mon, 20 Apr 2015 14:34:57 +0200 Subject: [PATCH 2/2] bug fix: menu does not work in firefox --- front-ui/app/components/shared/menuItemListComponent.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/front-ui/app/components/shared/menuItemListComponent.js b/front-ui/app/components/shared/menuItemListComponent.js index d3ea6f1..c0cda47 100644 --- a/front-ui/app/components/shared/menuItemListComponent.js +++ b/front-ui/app/components/shared/menuItemListComponent.js @@ -38,10 +38,10 @@ var MenuItemListComponent = React.createClass({ onMouseLeave: function() { MenuItemActions.unsetMenuItemHover(); }, - onMenuItemClick: function(menuItem) { + onMenuItemClick: function(menuItem, e) { MenuItemActions.unsetMenuItemHover(); NavigationActions.goToMenuItem(menuItem); - event.preventDefault(); + e.preventDefault(); }, _onCartClick: function() { NavigationActions.goToCart(); @@ -122,7 +122,7 @@ var MenuItemListComponent = React.createClass({