@app-masters/react-dashboard-components
Advanced tools
Comparing version 0.0.8 to 0.0.9
@@ -7,3 +7,3 @@ # Changelog | ||
## [0.0.6/0.0.8] - 2018-01-17 | ||
## [0.0.6/0.0.9] - 2018-01-17 | ||
### Changed | ||
@@ -10,0 +10,0 @@ - Fixing styles |
@@ -53,6 +53,12 @@ 'use strict'; | ||
if (style.titleStyle) titleStyle = style.titleStyle; | ||
if (style.subTitleStyle) subTitleStyle = style.subTitleStyle; | ||
if (style.boxStyle) boxStyle = style.boxStyle; | ||
console.log("----"); | ||
console.log("style.boxStyle", style.boxStyle); | ||
console.log("boxStyle", boxStyle); | ||
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); | ||
console.log("final > boxStyle", boxStyle); | ||
titleStyle = Object.assign({}, styles.titleStyle, titleStyle); | ||
@@ -59,0 +65,0 @@ subTitleStyle = Object.assign({}, styles.subTitleStyle, subTitleStyle); |
{ | ||
"name": "@app-masters/react-dashboard-components", | ||
"version": "0.0.8", | ||
"version": "0.0.9", | ||
"description": "", | ||
@@ -5,0 +5,0 @@ "main": "dist/index.js", |
@@ -8,9 +8,15 @@ import React, {Component} from 'react'; | ||
console.log("----"); | ||
console.log("style.boxStyle", style.boxStyle); | ||
console.log("boxStyle", boxStyle); | ||
if (style.titleStyle) | ||
titleStyle = style.titleStyle; | ||
titleStyle = Object.assign({}, style.titleStyle, styles.titleStyle, titleStyle); | ||
if (style.subTitleStyle) | ||
subTitleStyle = style.subTitleStyle; | ||
subTitleStyle = Object.assign({}, style.subTitleStyle, styles.subTitleStyle, subTitleStyle); | ||
if (style.boxStyle) | ||
boxStyle = style.boxStyle; | ||
boxStyle = Object.assign({}, boxStyle, style.boxStyle, styles.boxStyle); | ||
console.log("final > boxStyle", boxStyle); | ||
titleStyle = Object.assign({}, styles.titleStyle, titleStyle); | ||
@@ -35,3 +41,3 @@ subTitleStyle = Object.assign({}, styles.subTitleStyle, subTitleStyle); | ||
alignItems: 'flexStart', | ||
alignContent:'stretch', | ||
alignContent: 'stretch', | ||
flex: 1, | ||
@@ -38,0 +44,0 @@ padding: 12, |
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
14921
362