Merge pull request #904 from Budibase/Issue-856---invalid-chart-options-text

Text changed
This commit is contained in:
Joe 2020-12-10 12:44:37 +00:00 committed by GitHub
commit 0c50f0b8f7
3 changed files with 24 additions and 6 deletions

View File

@ -29,11 +29,19 @@
class="container" class="container"
use:styleable={$component.styles} use:styleable={$component.styles}
style="--cardWidth: {cardWidth}"> 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"> <div class="content">
<h2 class="heading">{heading}</h2> <h2 class="heading">{heading}</h2>
<h4 class="text">{description}</h4> <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>
</div> </div>

View File

@ -24,15 +24,23 @@
use:styleable={$component.styles} use:styleable={$component.styles}
class="container" class="container"
style="--cardWidth: {cardWidth}"> 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"> <div class="content">
<main> <main>
<h2 class="heading">{heading}</h2> <h2 class="heading">{heading}</h2>
<p class="text">{description}</p> <p class="text">{description}</p>
</main> </main>
<footer > <footer>
<p class="subtext">{subtext}</p> <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> </footer>
</div> </div>
</div> </div>

View File

@ -11,7 +11,9 @@
{#if options} {#if options}
<div use:chart={options} use:styleable={$component.styles} /> <div use:chart={options} use:styleable={$component.styles} />
{:else if options === false} {: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} {/if}
<style> <style>