Skip to content

Commit

Permalink
Run build
Browse files Browse the repository at this point in the history
  • Loading branch information
javivelasco committed Nov 3, 2016
1 parent a47e534 commit 03a334c
Show file tree
Hide file tree
Showing 4 changed files with 1 addition and 20 deletions.
2 changes: 1 addition & 1 deletion lib/button/IconButton.js
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ var factory = function factory(ripple, FontIcon) {
'data-react-toolbox': 'button'
});

return _react2.default.createElement(element, props, icon ? _react2.default.createElement(FontIcon, { className: theme.icon, value: icon }) : null, children);
return _react2.default.createElement(element, props, icon ? typeof icon === 'string' ? _react2.default.createElement(FontIcon, { className: theme.icon, value: icon }) : icon : null, children);
}
}]);

Expand Down
7 changes: 0 additions & 7 deletions lib/snackbar/Snackbar.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,6 @@ var _ActivableRenderer = require('../hoc/ActivableRenderer.js');

var _ActivableRenderer2 = _interopRequireDefault(_ActivableRenderer);

var _FontIcon = require('../font_icon/FontIcon.js');

var _FontIcon2 = _interopRequireDefault(_FontIcon);

var _Overlay = require('../overlay/Overlay.js');

var _Overlay2 = _interopRequireDefault(_Overlay);
Expand Down Expand Up @@ -80,7 +76,6 @@ var factory = function factory(Overlay, Button) {
action = _props.action,
active = _props.active,
children = _props.children,
icon = _props.icon,
label = _props.label,
onClick = _props.onClick,
theme = _props.theme,
Expand All @@ -94,7 +89,6 @@ var factory = function factory(Overlay, Button) {
_react2.default.createElement(
'div',
{ 'data-react-toolbox': 'snackbar', className: className },
icon ? _react2.default.createElement(_FontIcon2.default, { value: icon, className: theme.icon }) : null,
_react2.default.createElement(
'span',
{ className: theme.label },
Expand All @@ -115,7 +109,6 @@ var factory = function factory(Overlay, Button) {
active: _react.PropTypes.bool,
children: _react.PropTypes.node,
className: _react.PropTypes.string,
icon: _react.PropTypes.oneOfType([_react.PropTypes.string, _react.PropTypes.element]),
label: _react.PropTypes.oneOfType([_react.PropTypes.string, _react.PropTypes.element]),
onClick: _react.PropTypes.func,
onTimeout: _react.PropTypes.func,
Expand Down
8 changes: 0 additions & 8 deletions lib/snackbar/index.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,6 @@ export interface SnackbarTheme {
* Added to the root element in case it's cancel type.
*/
cancel?: string;
/**
* Used for the icon element.
*/
icon?: string;
/**
* Used for the label element.
*/
Expand All @@ -46,10 +42,6 @@ interface SnackbarProps extends ReactToolbox.Props {
* @default true
*/
active?: boolean;
/**
* String key for an icon or Element which will be displayed in left side of the snackbar.
*/
icon?: React.ReactNode | string;
/**
* Text to display in the content. Required.
*/
Expand Down
4 changes: 0 additions & 4 deletions lib/snackbar/theme.scss
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,6 @@
}
}

.icon {
margin-right: $snackbar-vertical-offset;
}

.label {
flex-grow: 1;
font-size: $font-size-small;
Expand Down

0 comments on commit 03a334c

Please sign in to comment.