@app-masters/react-dashboard-components
Advanced tools
Comparing version 0.0.9 to 0.0.10
@@ -7,3 +7,3 @@ # Changelog | ||
## [0.0.6/0.0.9] - 2018-01-17 | ||
## [0.0.6/0.0.10] - 2018-01-17 | ||
### Changed | ||
@@ -10,0 +10,0 @@ - Fixing styles |
@@ -57,5 +57,5 @@ 'use strict'; | ||
if (style.titleStyle) titleStyle = Object.assign({}, style.titleStyle, styles.titleStyle, titleStyle); | ||
if (style.subTitleStyle) subTitleStyle = Object.assign({}, style.subTitleStyle, styles.subTitleStyle, subTitleStyle); | ||
if (style.boxStyle) boxStyle = Object.assign({}, boxStyle, style.boxStyle, styles.boxStyle); | ||
if (style.titleStyle) titleStyle = Object.assign({}, styles.titleStyle, style.titleStyle, titleStyle); | ||
if (style.subTitleStyle) subTitleStyle = Object.assign({}, styles.subTitleStyle, style.subTitleStyle, subTitleStyle); | ||
if (style.boxStyle) boxStyle = Object.assign({}, styles.boxStyle, style.boxStyle, boxStyle); | ||
@@ -62,0 +62,0 @@ console.log("final > boxStyle", boxStyle); |
{ | ||
"name": "@app-masters/react-dashboard-components", | ||
"version": "0.0.9", | ||
"version": "0.0.10", | ||
"description": "", | ||
@@ -5,0 +5,0 @@ "main": "dist/index.js", |
@@ -13,7 +13,7 @@ import React, {Component} from 'react'; | ||
if (style.titleStyle) | ||
titleStyle = Object.assign({}, style.titleStyle, styles.titleStyle, titleStyle); | ||
titleStyle = Object.assign({}, styles.titleStyle, style.titleStyle, titleStyle); | ||
if (style.subTitleStyle) | ||
subTitleStyle = Object.assign({}, style.subTitleStyle, styles.subTitleStyle, subTitleStyle); | ||
subTitleStyle = Object.assign({}, styles.subTitleStyle, style.subTitleStyle, subTitleStyle); | ||
if (style.boxStyle) | ||
boxStyle = Object.assign({}, boxStyle, style.boxStyle, styles.boxStyle); | ||
boxStyle = Object.assign({}, styles.boxStyle, style.boxStyle, boxStyle); | ||
@@ -20,0 +20,0 @@ console.log("final > boxStyle", boxStyle); |
14923