Skip to content

Commit

Permalink
Merge pull request #1599 from smeup/dev-to-mas
Browse files Browse the repository at this point in the history
v7.3.1
  • Loading branch information
pasere-smeup authored Mar 3, 2023
2 parents 1a872e5 + 209a934 commit 801da47
Show file tree
Hide file tree
Showing 7 changed files with 22 additions and 16 deletions.
4 changes: 2 additions & 2 deletions packages/ketchup-react/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions packages/ketchup-react/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@sme.up/ketchup-react",
"version": "7.3.0",
"version": "7.3.1",
"module": "dist/index.js",
"typings": "dist/index.d.ts",
"keywords": [
Expand All @@ -20,7 +20,7 @@
"description": "Ketchup React Components library by smeup",
"license": "Apache-2.0",
"dependencies": {
"@sme.up/ketchup": "^7.3.0",
"@sme.up/ketchup": "^7.3.1",
"react": "18.2.0",
"react-dom": "18.2.0"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/ketchup-showcase/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"lint": "vue-cli-service lint"
},
"dependencies": {
"@sme.up/ketchup": "^7.3.0",
"@sme.up/ketchup": "^7.3.1",
"core-js": "^3.8.3",
"vue": "^2.6.14",
"vue-router": "^3.5.1"
Expand Down
4 changes: 2 additions & 2 deletions packages/ketchup-showcase/src/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,8 @@
@kup-tree-nodeselected="treeClick"
></kup-tree
><div class="version"
><a href="https://github.com/smeup/ketchup/releases/tag/v7.3.0"
>v7.3.0</a
><a href="https://github.com/smeup/ketchup/releases/tag/v7.3.1"
>v7.3.1</a
></div
></div
>
Expand Down
4 changes: 2 additions & 2 deletions packages/ketchup/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/ketchup/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@sme.up/ketchup",
"version": "7.3.0",
"version": "7.3.1",
"keywords": [
"smeup",
"KetchUP",
Expand Down
18 changes: 12 additions & 6 deletions packages/ketchup/src/components/kup-dash-list/kup-dash-list.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -77,16 +77,22 @@ export class KupDashList {
let valueInt = '';
let valueDec = '';
let iconColor = {
color: this.kupManager.theme.colorCheck(this.iconColor[count])
.hexColor,
color: this.iconColor[count]
? this.kupManager.theme.colorCheck(this.iconColor[count])
.hexColor
: null,
};
let textColor = {
color: this.kupManager.theme.colorCheck(this.textColor[count])
.hexColor,
color: this.textColor[count]
? this.kupManager.theme.colorCheck(this.textColor[count])
.hexColor
: null,
};
let valueColor = {
color: this.kupManager.theme.colorCheck(this.valueColor[count])
.hexColor,
color: this.valueColor[count]
? this.kupManager.theme.colorCheck(this.valueColor[count])
.hexColor
: null,
};

if (this.data.columns[0]) {
Expand Down

0 comments on commit 801da47

Please sign in to comment.