From 11ff8586d5f701001b06686398d21d8220234da6 Mon Sep 17 00:00:00 2001 From: kevmodrome Date: Wed, 9 Dec 2020 13:21:04 +0100 Subject: [PATCH] changes settings prop of card link color --- .../userInterface/temporaryPanelStructure.js | 14 +++++++------- packages/standard-components/components.json | 12 +++++++++--- packages/standard-components/src/Card.svelte | 6 +++--- .../standard-components/src/CardHorizontal.svelte | 6 +++--- 4 files changed, 22 insertions(+), 16 deletions(-) diff --git a/packages/builder/src/components/userInterface/temporaryPanelStructure.js b/packages/builder/src/components/userInterface/temporaryPanelStructure.js index 34d213350d..cb64d163a2 100644 --- a/packages/builder/src/components/userInterface/temporaryPanelStructure.js +++ b/packages/builder/src/components/userInterface/temporaryPanelStructure.js @@ -310,15 +310,15 @@ export default { }, { label: "Link Color", - key: "color", - control: Input, - placeholder: "Link Color", + key: "linkColor", + control: Colorpicker, + defaultValue: "#000" }, { label: "Hover Color", key: "linkHoverColor", - control: Input, - placeholder: "Hover Color", + control: Colorpicker, + defaultValue: "#222" }, { label: "Image Height", @@ -385,7 +385,7 @@ export default { }, { label: "Link Color", - key: "color", + key: "linkColor", control: Colorpicker, defaultValue: "#000" }, @@ -393,7 +393,7 @@ export default { label: "Hover Color", key: "linkHoverColor", control: Colorpicker, - defaultValue: "#000" + defaultValue: "#222" }, { label: "Card Width", diff --git a/packages/standard-components/components.json b/packages/standard-components/components.json index 82509a314b..7da618224e 100644 --- a/packages/standard-components/components.json +++ b/packages/standard-components/components.json @@ -234,8 +234,14 @@ "description": "string", "linkText": "string", "linkUrl": "string", - "color": "string", - "linkHoverColor": "string", + "linkColor": { + "type": "string", + "default": "#000" + }, + "linkHoverColor": { + "type": "string", + "default": "#000" + }, "imageHeight": { "type": "options", "default": "20rem", @@ -274,7 +280,7 @@ "subtext": "string", "linkText": "string", "linkUrl": "string", - "color": { + "linkColor": { "type": "string", "default": "#000" }, diff --git a/packages/standard-components/src/Card.svelte b/packages/standard-components/src/Card.svelte index 148c6f0a89..013052f80c 100644 --- a/packages/standard-components/src/Card.svelte +++ b/packages/standard-components/src/Card.svelte @@ -11,13 +11,13 @@ export let description = "" export let linkText = "" export let linkUrl - export let color + export let linkColor export let linkHoverColor export let imageHeight export let cardWidth $: cssVariables = { - color, + linkColor, linkHoverColor, imageHeight, cardWidth, @@ -75,7 +75,7 @@ a { margin: 0.5rem 0; text-decoration: none; - color: var(--color); + color: var(--linkColor); font-weight: 600; } diff --git a/packages/standard-components/src/CardHorizontal.svelte b/packages/standard-components/src/CardHorizontal.svelte index df47097180..9bd0ba21a5 100644 --- a/packages/standard-components/src/CardHorizontal.svelte +++ b/packages/standard-components/src/CardHorizontal.svelte @@ -12,14 +12,14 @@ export let subtext = "" export let linkText = "" export let linkUrl - export let color + export let linkColor export let linkHoverColor export let cardWidth export let imageWidth export let imageHeight $: cssVariables = { - color, + linkColor, linkHoverColor, imageWidth, cardWidth, @@ -97,7 +97,7 @@ a { margin: 0.5rem 0 0 0; text-decoration: none; - color: var(--color); + color: var(--linkColor); font-weight: 600; font-size: 0.85rem; margin: 0;