Merge branch 'master' of github.com:senaduka/ribica
This commit is contained in:
@@ -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({
|
||||
<li className="col-sm-3" key={menuSubItem.id}>
|
||||
|
||||
<ul>
|
||||
<li className="dropdown-header"><a href="kategorija.html" onClick={self.onMenuItemClick.bind(self, menuSubItem)}><p>{menuSubItem.title}</p></a></li>
|
||||
<li className="dropdown-header"><a href="#" onClick={self.onMenuItemClick.bind(self, menuSubItem)}><p>{menuSubItem.title}</p></a></li>
|
||||
{menuSubItem.menu_sub_sub_items.map(function(menuSubSubItem) {
|
||||
return (<li><a href="#" onClick={self.onMenuItemClick.bind(self, menuSubSubItem)}>{menuSubSubItem.title}</a></li>)
|
||||
})}
|
||||
@@ -192,7 +192,7 @@ var MenuItemListComponent = React.createClass({
|
||||
<li className="col-sm-3" key={menuSubItem.id}>
|
||||
|
||||
<ul>
|
||||
<li className="dropdown-header"><a href="kategorija.html" onClick={self.onMenuItemClick.bind(self, menuSubItem)}><p>{menuSubItem.title}</p></a></li>
|
||||
<li className="dropdown-header"><a href="#" onClick={self.onMenuItemClick.bind(self, menuSubItem)}><p>{menuSubItem.title}</p></a></li>
|
||||
{menuSubItem.menu_sub_sub_items.map(function(menuSubSubItem) {
|
||||
return (<li><a href="#" onClick={self.onMenuItemClick.bind(self, menuSubSubItem)}>{menuSubSubItem.title}</a></li>)
|
||||
})}
|
||||
|
||||
@@ -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 ;
|
||||
|
||||
Reference in New Issue
Block a user