react-interface
Advanced tools
Comparing version 0.8.28 to 0.8.29
@@ -24,3 +24,2 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; | ||
// Look into https://yeun.github.io/open-color/ as a base theme | ||
var Theme = function Theme(_ref) { | ||
@@ -32,9 +31,7 @@ var _ref$theme = _ref.theme, | ||
var primary = color || theme && theme.colors && theme.colors.primary; | ||
if (primary) { | ||
var primaryPalette = getColorShades(primary, 'primary'); | ||
if (color) { | ||
var primary = getColorShades(color, 'primary'); | ||
// Merge theme and primary color palette | ||
theme = merge(theme, { | ||
colors: _extends({}, primaryPalette, colorListToMap(palx(color))) | ||
colors: _extends({}, primary, colorListToMap(palx(color))) | ||
}); | ||
@@ -41,0 +38,0 @@ } |
@@ -45,3 +45,2 @@ 'use strict'; | ||
// Look into https://yeun.github.io/open-color/ as a base theme | ||
var Theme = function Theme(_ref) { | ||
@@ -53,9 +52,7 @@ var _ref$theme = _ref.theme, | ||
var primary = color || theme && theme.colors && theme.colors.primary; | ||
if (primary) { | ||
var primaryPalette = (0, _colors.getColorShades)(primary, 'primary'); | ||
if (color) { | ||
var primary = (0, _colors.getColorShades)(color, 'primary'); | ||
// Merge theme and primary color palette | ||
theme = (0, _deepmerge2.default)(theme, { | ||
colors: _extends({}, primaryPalette, (0, _colors.colorListToMap)((0, _palx2.default)(color))) | ||
colors: _extends({}, primary, (0, _colors.colorListToMap)((0, _palx2.default)(color))) | ||
}); | ||
@@ -62,0 +59,0 @@ } |
{ | ||
"name": "react-interface", | ||
"version": "0.8.28", | ||
"version": "0.8.29", | ||
"description": "react-interface React component", | ||
@@ -5,0 +5,0 @@ "main": "lib/index.js", |
130937
2643