Skip to content

Commit

Permalink
Merge branch 'fix_#212'
Browse files Browse the repository at this point in the history
  • Loading branch information
haxpor committed Mar 12, 2017
2 parents 96c831b + d38636c commit a5757f2
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions src/components/grid/grid.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import React from 'react';
import classNames from 'classnames';
import GridIcon from './grid_icon';
import GridLabel from './grid_label';
import { Link } from 'react-router';

/**
* WeUI Grid wrapper, contain elements of `GridIcon` and `GridLabel`
Expand Down Expand Up @@ -33,11 +34,11 @@ export default class Grid extends React.Component {
}, className);

return (
<a className={cls} {...others}>
<Link className={cls} {...others}>
{icon ? <GridIcon>{icon}</GridIcon> : false}
{children}
{label ? <GridLabel>{label}</GridLabel> : false}
</a>
</Link>
);
}
};

0 comments on commit a5757f2

Please sign in to comment.