Browse Source
Merge pull request #904 from Budibase/Issue-856---invalid-chart-options-text
Text changed
gh-pages
Joe
6 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with
24 additions and
6 deletions
-
packages/standard-components/src/Card.svelte
-
packages/standard-components/src/CardHorizontal.svelte
-
packages/standard-components/src/charts/ApexChart.svelte
|
|
|
@ -29,11 +29,19 @@ |
|
|
|
class="container" |
|
|
|
use:styleable={$component.styles} |
|
|
|
style="--cardWidth: {cardWidth}"> |
|
|
|
{#if showImage}<img style="--imageWidth: {imageWidth}; --imageHeight: {imageHeight}" class="image" src={imageUrl} alt="" />{/if} |
|
|
|
{#if showImage} |
|
|
|
<img |
|
|
|
style="--imageWidth: {imageWidth}; --imageHeight: {imageHeight}" |
|
|
|
class="image" |
|
|
|
src={imageUrl} |
|
|
|
alt="" /> |
|
|
|
{/if} |
|
|
|
<div class="content"> |
|
|
|
<h2 class="heading">{heading}</h2> |
|
|
|
<h4 class="text">{description}</h4> |
|
|
|
<a style="--linkColor: {linkColor}; --linkHoverColor: {linkHoverColor}" href={linkUrl}>{linkText}</a> |
|
|
|
<a |
|
|
|
style="--linkColor: {linkColor}; --linkHoverColor: {linkHoverColor}" |
|
|
|
href={linkUrl}>{linkText}</a> |
|
|
|
</div> |
|
|
|
</div> |
|
|
|
|
|
|
|
|
|
|
|
@ -24,15 +24,23 @@ |
|
|
|
use:styleable={$component.styles} |
|
|
|
class="container" |
|
|
|
style="--cardWidth: {cardWidth}"> |
|
|
|
{#if showImage}<img style="--imageWidth: {imageWidth}; --imageHeight: {imageHeight}" class="image" src={imageUrl} alt="" />{/if} |
|
|
|
{#if showImage} |
|
|
|
<img |
|
|
|
style="--imageWidth: {imageWidth}; --imageHeight: {imageHeight}" |
|
|
|
class="image" |
|
|
|
src={imageUrl} |
|
|
|
alt="" /> |
|
|
|
{/if} |
|
|
|
<div class="content"> |
|
|
|
<main> |
|
|
|
<h2 class="heading">{heading}</h2> |
|
|
|
<p class="text">{description}</p> |
|
|
|
</main> |
|
|
|
<footer > |
|
|
|
<footer> |
|
|
|
<p class="subtext">{subtext}</p> |
|
|
|
<a style="--linkColor: {linkColor}; --linkHoverColor: {linkHoverColor}" href={linkUrl}>{linkText}</a> |
|
|
|
<a |
|
|
|
style="--linkColor: {linkColor}; --linkHoverColor: {linkHoverColor}" |
|
|
|
href={linkUrl}>{linkText}</a> |
|
|
|
</footer> |
|
|
|
</div> |
|
|
|
</div> |
|
|
|
|
|
|
|
@ -11,7 +11,9 @@ |
|
|
|
{#if options} |
|
|
|
<div use:chart={options} use:styleable={$component.styles} /> |
|
|
|
{:else if options === false} |
|
|
|
<div use:styleable={$component.styles}>Invalid chart options</div> |
|
|
|
<div use:styleable={$component.styles}> |
|
|
|
Use the settings panel to build your chart --> |
|
|
|
</div> |
|
|
|
{/if} |
|
|
|
|
|
|
|
<style> |
|
|
|
|