cyverse-ui
Advanced tools
Comparing version 1.1.3 to 1.1.4
@@ -52,3 +52,3 @@ "use strict"; | ||
icon: { | ||
transition: "transform ease .1s" | ||
transition: "transform ease .2s !important" | ||
}, | ||
@@ -98,3 +98,2 @@ icon__open: { | ||
var _props = this.props, | ||
theme = _props.theme, | ||
classes = _props.classes, | ||
@@ -105,6 +104,4 @@ className = _props.className, | ||
onClick = _props.onClick, | ||
backgroundColor = _props.backgroundColor, | ||
secondary = _props.secondary, | ||
isOpen = _props.isOpen, | ||
rest = _objectWithoutProperties(_props, ["theme", "classes", "className", "children", "icon", "onClick", "backgroundColor", "secondary", "isOpen"]); | ||
rest = _objectWithoutProperties(_props, ["classes", "className", "children", "icon", "onClick", "isOpen"]); | ||
// Define classes for wrapper | ||
@@ -117,12 +114,2 @@ | ||
// Define background color, | ||
// priority goes to secondary "accent color" prop, | ||
// else to backgroundColor prop, | ||
// defaults to primary color | ||
var _theme$palette = theme.palette, | ||
accent1Color = _theme$palette.accent1Color, | ||
primary1Color = _theme$palette.primary1Color; | ||
var closedBackground = secondary ? accent1Color : backgroundColor || primary1Color; | ||
return _react2.default.createElement( | ||
@@ -136,3 +123,3 @@ _Element2.default, | ||
className: "CY-FloatingActionButton-btn", | ||
color: isOpen ? "#585858" : "secondary", | ||
color: isOpen ? "" : "secondary", | ||
onClick: onClick || this.onClick | ||
@@ -139,0 +126,0 @@ }), |
@@ -52,3 +52,3 @@ "use strict"; | ||
icon: { | ||
transition: "transform ease .1s" | ||
transition: "transform ease .2s !important" | ||
}, | ||
@@ -98,3 +98,2 @@ icon__open: { | ||
var _props = this.props, | ||
theme = _props.theme, | ||
classes = _props.classes, | ||
@@ -105,6 +104,4 @@ className = _props.className, | ||
onClick = _props.onClick, | ||
backgroundColor = _props.backgroundColor, | ||
secondary = _props.secondary, | ||
isOpen = _props.isOpen, | ||
rest = _objectWithoutProperties(_props, ["theme", "classes", "className", "children", "icon", "onClick", "backgroundColor", "secondary", "isOpen"]); | ||
rest = _objectWithoutProperties(_props, ["classes", "className", "children", "icon", "onClick", "isOpen"]); | ||
// Define classes for wrapper | ||
@@ -117,12 +114,2 @@ | ||
// Define background color, | ||
// priority goes to secondary "accent color" prop, | ||
// else to backgroundColor prop, | ||
// defaults to primary color | ||
var _theme$palette = theme.palette, | ||
accent1Color = _theme$palette.accent1Color, | ||
primary1Color = _theme$palette.primary1Color; | ||
var closedBackground = secondary ? accent1Color : backgroundColor || primary1Color; | ||
return _react2.default.createElement( | ||
@@ -136,3 +123,3 @@ _Element2.default, | ||
className: "CY-FloatingActionButton-btn", | ||
color: isOpen ? "#585858" : "secondary", | ||
color: isOpen ? "" : "secondary", | ||
onClick: onClick || this.onClick | ||
@@ -139,0 +126,0 @@ }), |
{ | ||
"name": "cyverse-ui", | ||
"version": "1.1.3", | ||
"version": "1.1.4", | ||
"description": "A React UI library for the CyVerse tool set", | ||
@@ -5,0 +5,0 @@ "repository": "cyverse/cyverse-ui", |
@@ -15,3 +15,3 @@ import React, { Component } from "react"; | ||
icon: { | ||
transition: "transform ease .1s", | ||
transition: "transform ease .2s !important", | ||
}, | ||
@@ -50,3 +50,2 @@ icon__open: { | ||
const { | ||
theme, | ||
classes, | ||
@@ -57,4 +56,2 @@ className, | ||
onClick, | ||
backgroundColor, | ||
secondary, | ||
isOpen, | ||
@@ -78,11 +75,2 @@ ...rest | ||
// Define background color, | ||
// priority goes to secondary "accent color" prop, | ||
// else to backgroundColor prop, | ||
// defaults to primary color | ||
const { accent1Color, primary1Color } = theme.palette; | ||
const closedBackground = secondary | ||
? accent1Color | ||
: backgroundColor || primary1Color; | ||
return ( | ||
@@ -95,3 +83,3 @@ <Element {...rest} className={wrapperClasses}> | ||
color={ | ||
isOpen ? "#585858" : "secondary" | ||
isOpen ? "" : "secondary" | ||
} | ||
@@ -98,0 +86,0 @@ onClick={onClick || this.onClick} |
558297
11807