diff --git a/src/lib/Mark.svelte b/src/lib/Mark.svelte index 11a19870..f9236abd 100644 --- a/src/lib/Mark.svelte +++ b/src/lib/Mark.svelte @@ -11,7 +11,7 @@ { mark: Mark; usedScales: ReturnType; - scaledData: ScaledDataRecord[]; + scaledData: ScaledDataRecord[]; } ] >; diff --git a/src/lib/marks/CustomMark.svelte b/src/lib/marks/CustomMark.svelte index c3c8242e..122cb68a 100644 --- a/src/lib/marks/CustomMark.svelte +++ b/src/lib/marks/CustomMark.svelte @@ -4,10 +4,18 @@ --> - - {#each data as datum, i (i)} - {@const x_ = resolveChannel('x', datum, { x, y })} - {@const y_ = resolveChannel('y', datum, { x, y })} - {#if isValid(x_) && isValid(y_)} - {@const [px, py] = projectXY(plot.scales, x_, y_)} - - {@render children({ datum, x: px, y: py })} - + !!options[d])} {...args}> + {#snippet children({ scaledData, usedScales })} + {#if marks} + {@render marks({ records: scaledData.filter((d) => d.valid), usedScales })} + {/if} + {#if mark} + {#each scaledData as datum, i (i)} + {#if datum.valid} + {@render mark({ record: datum, index: i, usedScales })} + {/if} + {/each} {/if} - {/each} - + {/snippet} + diff --git a/src/lib/types/channel.ts b/src/lib/types/channel.ts index 7524c472..e9e677a2 100644 --- a/src/lib/types/channel.ts +++ b/src/lib/types/channel.ts @@ -39,4 +39,8 @@ export type ScaledChannelName = | 'y1' | 'y2'; +export type ScaledChannelType = T extends 'fill' | 'stroke' | 'symbol' + ? string + : number; + export type ChannelName = ScaledChannelName | 'z' | 'sort' | 'filter' | 'interval'; diff --git a/src/lib/types/data.ts b/src/lib/types/data.ts index 854edbb7..985916ae 100644 --- a/src/lib/types/data.ts +++ b/src/lib/types/data.ts @@ -1,4 +1,4 @@ -import type { ScaledChannelName } from './channel.js'; +import type { ScaledChannelName, ScaledChannelType } from './channel.js'; export type RawValue = number | Date | boolean | string | symbol; @@ -12,9 +12,9 @@ export type ResolvedDataRecord> = Partial< datum: DataRecord; }; -export type ScaledDataRecord> = Partial< - Record -> & { +export type ScaledDataRecord> = Partial<{ + [K in ScaledChannelName]?: ScaledChannelType; +}> & { datum: DataRecord; valid: Boolean; }; diff --git a/src/lib/types/mark.ts b/src/lib/types/mark.ts index 372a3355..fa742222 100644 --- a/src/lib/types/mark.ts +++ b/src/lib/types/mark.ts @@ -13,6 +13,7 @@ export type MarkType = | 'barX' | 'barY' | 'cell' + | 'custom' | 'dot' | 'vector' | 'frame' diff --git a/src/routes/examples/custom/custom-rect.svelte b/src/routes/examples/custom/custom-rect.svelte new file mode 100644 index 00000000..a49ca147 --- /dev/null +++ b/src/routes/examples/custom/custom-rect.svelte @@ -0,0 +1,39 @@ + + + + + + + {#snippet mark({ record })} + + {/snippet} + + diff --git a/src/routes/examples/custom/custom-svg.svelte b/src/routes/examples/custom/multiple.svelte similarity index 66% rename from src/routes/examples/custom/custom-svg.svelte rename to src/routes/examples/custom/multiple.svelte index e317e0d2..c7d0c883 100644 --- a/src/routes/examples/custom/custom-svg.svelte +++ b/src/routes/examples/custom/multiple.svelte @@ -1,5 +1,5 @@ + + + + + + {#snippet children({ record })} + + + + + {/snippet} + + + diff --git a/src/routes/marks/custom/+page.md b/src/routes/marks/custom/+page.md index 40c3358e..b0353906 100644 --- a/src/routes/marks/custom/+page.md +++ b/src/routes/marks/custom/+page.md @@ -2,7 +2,7 @@ title: Custom marks --- -## CustomMark +You can use the custom mark to render your own marks. You can pass data to the custom mark and use the plot scales. Let's say we want to render our own symbols instead of using the [dot mark](/marks/dot): ```svelte live - - - - - - + - {#snippet children({ datum })} - + y="culmen_depth_mm" + stroke="species"> + {#snippet mark({ record })} + + + {/snippet} ``` ```svelte - + + {#snippet mark({ record })} + + + + {/snippet} + +``` + +We can also pass the `marks` (plural) snippet to draw all symbols at once: + +```svelte + + {#snippet marks({ records })} + [r.x, r.y]) + .join(' ')} /> + {/snippet} + +``` + +```svelte live + + + - {#snippet children({ datum })} - - + {#snippet marks({ records })} + [r.x, r.y]) + .join(' ')} /> {/snippet} ``` +see [example](/examples/custom/multiple) + +## CustomMark + +```svelte + + {#snippet mark({ record })} + + {/snippet} + +``` + ## CustomMarkHTML You can arrange custom HTML elements in the plot using the `CustomMarkHTML` mark (name subject to change) @@ -176,54 +220,3 @@ You can arrange custom HTML elements in the plot using the `CustomMarkHTML` mark - x - y - frameAnchor (see [Text](/marks/text) mark) - -## mapXY - -Another way to use custom marks is to position them yourself using the `mapXY` method: - -```svelte live - - - - {#snippet children({ mapXY })} - {#each data as { val1, val2 }} - {@const { x, y } = mapXY(val1, val2)} - - - - {/each} - {/snippet} - -``` - -```svelte - - {#snippet children({ mapXY })} - {#each data as { val1, val2 }} - {@const { x, y } = mapXY(val1, val2)} - - - - {/each} - {/snippet} - -``` diff --git a/static/examples/area/area-x.dark.png b/static/examples/area/area-x.dark.png index e210174e..c935085a 100644 Binary files a/static/examples/area/area-x.dark.png and b/static/examples/area/area-x.dark.png differ diff --git a/static/examples/area/area-x.png b/static/examples/area/area-x.png index b32fccbc..d74b6086 100644 Binary files a/static/examples/area/area-x.png and b/static/examples/area/area-x.png differ diff --git a/static/examples/area/area-y.dark.png b/static/examples/area/area-y.dark.png index 58cae6f6..d977701c 100644 Binary files a/static/examples/area/area-y.dark.png and b/static/examples/area/area-y.dark.png differ diff --git a/static/examples/area/area-y.png b/static/examples/area/area-y.png index cf1cd863..099a082d 100644 Binary files a/static/examples/area/area-y.png and b/static/examples/area/area-y.png differ diff --git a/static/examples/area/area.dark.png b/static/examples/area/area.dark.png index 30b7302a..d75cbffc 100644 Binary files a/static/examples/area/area.dark.png and b/static/examples/area/area.dark.png differ diff --git a/static/examples/area/area.png b/static/examples/area/area.png index 61e2ff4c..00b84837 100644 Binary files a/static/examples/area/area.png and b/static/examples/area/area.png differ diff --git a/static/examples/area/events.dark.png b/static/examples/area/events.dark.png index aefd9731..581bbedf 100644 Binary files a/static/examples/area/events.dark.png and b/static/examples/area/events.dark.png differ diff --git a/static/examples/area/events.png b/static/examples/area/events.png index 3e113f41..43ad090a 100644 Binary files a/static/examples/area/events.png and b/static/examples/area/events.png differ diff --git a/static/examples/area/streamgraph.dark.png b/static/examples/area/streamgraph.dark.png index 2371a46f..13cdf908 100644 Binary files a/static/examples/area/streamgraph.dark.png and b/static/examples/area/streamgraph.dark.png differ diff --git a/static/examples/area/streamgraph.png b/static/examples/area/streamgraph.png index e9241221..122f2eb2 100644 Binary files a/static/examples/area/streamgraph.png and b/static/examples/area/streamgraph.png differ diff --git a/static/examples/arrow/metro.dark.png b/static/examples/arrow/metro.dark.png index eb1fc70d..c9bfed92 100644 Binary files a/static/examples/arrow/metro.dark.png and b/static/examples/arrow/metro.dark.png differ diff --git a/static/examples/arrow/metro.png b/static/examples/arrow/metro.png index 9c910099..4aa74ce3 100644 Binary files a/static/examples/arrow/metro.png and b/static/examples/arrow/metro.png differ diff --git a/static/examples/axis/datawrapper-ticks.dark.png b/static/examples/axis/datawrapper-ticks.dark.png index c82f02b4..6a8895f0 100644 Binary files a/static/examples/axis/datawrapper-ticks.dark.png and b/static/examples/axis/datawrapper-ticks.dark.png differ diff --git a/static/examples/axis/datawrapper-ticks.png b/static/examples/axis/datawrapper-ticks.png index 0a5bb17b..8ecaf0b4 100644 Binary files a/static/examples/axis/datawrapper-ticks.png and b/static/examples/axis/datawrapper-ticks.png differ diff --git a/static/examples/axis/major-minor.dark.png b/static/examples/axis/major-minor.dark.png index 9c7f7bea..b62e4412 100644 Binary files a/static/examples/axis/major-minor.dark.png and b/static/examples/axis/major-minor.dark.png differ diff --git a/static/examples/axis/major-minor.png b/static/examples/axis/major-minor.png index 3083f5d6..bae4acc1 100644 Binary files a/static/examples/axis/major-minor.png and b/static/examples/axis/major-minor.png differ diff --git a/static/examples/axis/tick-classes.dark.png b/static/examples/axis/tick-classes.dark.png index 0a15ca1e..958abc44 100644 Binary files a/static/examples/axis/tick-classes.dark.png and b/static/examples/axis/tick-classes.dark.png differ diff --git a/static/examples/axis/tick-classes.png b/static/examples/axis/tick-classes.png index a557c35a..029656d9 100644 Binary files a/static/examples/axis/tick-classes.png and b/static/examples/axis/tick-classes.png differ diff --git a/static/examples/axis/tick-count.dark.png b/static/examples/axis/tick-count.dark.png index 06c5026b..6c76abc9 100644 Binary files a/static/examples/axis/tick-count.dark.png and b/static/examples/axis/tick-count.dark.png differ diff --git a/static/examples/axis/tick-count.png b/static/examples/axis/tick-count.png index 5bb26882..d5dfffa2 100644 Binary files a/static/examples/axis/tick-count.png and b/static/examples/axis/tick-count.png differ diff --git a/static/examples/axis/tick-interval.dark.png b/static/examples/axis/tick-interval.dark.png index dd7095e5..27c89e9a 100644 Binary files a/static/examples/axis/tick-interval.dark.png and b/static/examples/axis/tick-interval.dark.png differ diff --git a/static/examples/axis/tick-interval.png b/static/examples/axis/tick-interval.png index 21d3dcff..241930f8 100644 Binary files a/static/examples/axis/tick-interval.png and b/static/examples/axis/tick-interval.png differ diff --git a/static/examples/axis/tick-spacing.dark.png b/static/examples/axis/tick-spacing.dark.png index 0dcfd9c2..c82146f3 100644 Binary files a/static/examples/axis/tick-spacing.dark.png and b/static/examples/axis/tick-spacing.dark.png differ diff --git a/static/examples/axis/tick-spacing.png b/static/examples/axis/tick-spacing.png index 1e1dabb2..3ca808df 100644 Binary files a/static/examples/axis/tick-spacing.png and b/static/examples/axis/tick-spacing.png differ diff --git a/static/examples/axis/ticks-inside.dark.png b/static/examples/axis/ticks-inside.dark.png index 691f45c0..7c7a162b 100644 Binary files a/static/examples/axis/ticks-inside.dark.png and b/static/examples/axis/ticks-inside.dark.png differ diff --git a/static/examples/axis/ticks-inside.png b/static/examples/axis/ticks-inside.png index 7a46aa00..dc361dcc 100644 Binary files a/static/examples/axis/ticks-inside.png and b/static/examples/axis/ticks-inside.png differ diff --git a/static/examples/bar/defaults.dark.png b/static/examples/bar/defaults.dark.png index 681cd88c..76d1fa78 100644 Binary files a/static/examples/bar/defaults.dark.png and b/static/examples/bar/defaults.dark.png differ diff --git a/static/examples/bar/defaults.png b/static/examples/bar/defaults.png index 5a41bce1..4141bc00 100644 Binary files a/static/examples/bar/defaults.png and b/static/examples/bar/defaults.png differ diff --git a/static/examples/bar/linked-bars.dark.png b/static/examples/bar/linked-bars.dark.png index c78608de..ebf65f20 100644 Binary files a/static/examples/bar/linked-bars.dark.png and b/static/examples/bar/linked-bars.dark.png differ diff --git a/static/examples/bar/linked-bars.png b/static/examples/bar/linked-bars.png index df0c4ba0..2f21e99d 100644 Binary files a/static/examples/bar/linked-bars.png and b/static/examples/bar/linked-bars.png differ diff --git a/static/examples/bar/shuffled-bars.dark.png b/static/examples/bar/shuffled-bars.dark.png index a7de7c6a..805e749a 100644 Binary files a/static/examples/bar/shuffled-bars.dark.png and b/static/examples/bar/shuffled-bars.dark.png differ diff --git a/static/examples/bar/shuffled-bars.png b/static/examples/bar/shuffled-bars.png index ab088dad..b4060d17 100644 Binary files a/static/examples/bar/shuffled-bars.png and b/static/examples/bar/shuffled-bars.png differ diff --git a/static/examples/brush/constrained.dark.png b/static/examples/brush/constrained.dark.png index c06b1fe8..ca6be86c 100644 Binary files a/static/examples/brush/constrained.dark.png and b/static/examples/brush/constrained.dark.png differ diff --git a/static/examples/brush/constrained.png b/static/examples/brush/constrained.png index 471ef206..2cf84be1 100644 Binary files a/static/examples/brush/constrained.png and b/static/examples/brush/constrained.png differ diff --git a/static/examples/brush/filter.dark.png b/static/examples/brush/filter.dark.png index c06b1fe8..0ba68cb9 100644 Binary files a/static/examples/brush/filter.dark.png and b/static/examples/brush/filter.dark.png differ diff --git a/static/examples/brush/filter.png b/static/examples/brush/filter.png index 471ef206..2cf84be1 100644 Binary files a/static/examples/brush/filter.png and b/static/examples/brush/filter.png differ diff --git a/static/examples/brush/overview-detail.dark.png b/static/examples/brush/overview-detail.dark.png index 518e9016..7b33c523 100644 Binary files a/static/examples/brush/overview-detail.dark.png and b/static/examples/brush/overview-detail.dark.png differ diff --git a/static/examples/brush/overview-detail.png b/static/examples/brush/overview-detail.png index 5bbf2e24..46c85d2e 100644 Binary files a/static/examples/brush/overview-detail.png and b/static/examples/brush/overview-detail.png differ diff --git a/static/examples/brush/zoomable-scatter.dark.png b/static/examples/brush/zoomable-scatter.dark.png index 768608a6..1e9c5442 100644 Binary files a/static/examples/brush/zoomable-scatter.dark.png and b/static/examples/brush/zoomable-scatter.dark.png differ diff --git a/static/examples/brush/zoomable-scatter.png b/static/examples/brush/zoomable-scatter.png index c0528c55..f46a8a47 100644 Binary files a/static/examples/brush/zoomable-scatter.png and b/static/examples/brush/zoomable-scatter.png differ diff --git a/static/examples/cell/simpsons.dark.png b/static/examples/cell/simpsons.dark.png index 20a9ed1e..5f72fea4 100644 Binary files a/static/examples/cell/simpsons.dark.png and b/static/examples/cell/simpsons.dark.png differ diff --git a/static/examples/cell/simpsons.png b/static/examples/cell/simpsons.png index 518391e6..f88be3f1 100644 Binary files a/static/examples/cell/simpsons.png and b/static/examples/cell/simpsons.png differ diff --git a/static/examples/cell/temperatures.dark.png b/static/examples/cell/temperatures.dark.png index 084c75b0..ebc956d2 100644 Binary files a/static/examples/cell/temperatures.dark.png and b/static/examples/cell/temperatures.dark.png differ diff --git a/static/examples/cell/temperatures.png b/static/examples/cell/temperatures.png index 606e91b9..3cef7c75 100644 Binary files a/static/examples/cell/temperatures.png and b/static/examples/cell/temperatures.png differ diff --git a/static/examples/custom/custom-rect.dark.png b/static/examples/custom/custom-rect.dark.png new file mode 100644 index 00000000..a74b0a17 Binary files /dev/null and b/static/examples/custom/custom-rect.dark.png differ diff --git a/static/examples/custom/custom-rect.png b/static/examples/custom/custom-rect.png new file mode 100644 index 00000000..2db03c13 Binary files /dev/null and b/static/examples/custom/custom-rect.png differ diff --git a/static/examples/custom/multiple.dark.png b/static/examples/custom/multiple.dark.png new file mode 100644 index 00000000..2bb4f16d Binary files /dev/null and b/static/examples/custom/multiple.dark.png differ diff --git a/static/examples/custom/multiple.png b/static/examples/custom/multiple.png new file mode 100644 index 00000000..f690e808 Binary files /dev/null and b/static/examples/custom/multiple.png differ diff --git a/static/examples/custom/single.dark.png b/static/examples/custom/single.dark.png new file mode 100644 index 00000000..e803d3fe Binary files /dev/null and b/static/examples/custom/single.dark.png differ diff --git a/static/examples/custom/single.png b/static/examples/custom/single.png new file mode 100644 index 00000000..86eaf31e Binary files /dev/null and b/static/examples/custom/single.png differ diff --git a/static/examples/dot/0-scatterplot.dark.png b/static/examples/dot/0-scatterplot.dark.png index 8335c9aa..b788e0a2 100644 Binary files a/static/examples/dot/0-scatterplot.dark.png and b/static/examples/dot/0-scatterplot.dark.png differ diff --git a/static/examples/dot/0-scatterplot.png b/static/examples/dot/0-scatterplot.png index 2cd78f60..ecc6d015 100644 Binary files a/static/examples/dot/0-scatterplot.png and b/static/examples/dot/0-scatterplot.png differ diff --git a/static/examples/dot/1-colored-scatterplot.dark.png b/static/examples/dot/1-colored-scatterplot.dark.png index 7efaeaec..f67edaf6 100644 Binary files a/static/examples/dot/1-colored-scatterplot.dark.png and b/static/examples/dot/1-colored-scatterplot.dark.png differ diff --git a/static/examples/dot/1-colored-scatterplot.png b/static/examples/dot/1-colored-scatterplot.png index 2e633289..b32fca57 100644 Binary files a/static/examples/dot/1-colored-scatterplot.png and b/static/examples/dot/1-colored-scatterplot.png differ diff --git a/static/examples/dot/2-symbol-channel.dark.png b/static/examples/dot/2-symbol-channel.dark.png index 1cb80f27..d1087227 100644 Binary files a/static/examples/dot/2-symbol-channel.dark.png and b/static/examples/dot/2-symbol-channel.dark.png differ diff --git a/static/examples/dot/2-symbol-channel.png b/static/examples/dot/2-symbol-channel.png index 1e20f3dd..a9863db3 100644 Binary files a/static/examples/dot/2-symbol-channel.png and b/static/examples/dot/2-symbol-channel.png differ diff --git a/static/examples/dot/3-dot-plot.dark.png b/static/examples/dot/3-dot-plot.dark.png index 7182f1e9..0c3b1580 100644 Binary files a/static/examples/dot/3-dot-plot.dark.png and b/static/examples/dot/3-dot-plot.dark.png differ diff --git a/static/examples/dot/3-dot-plot.png b/static/examples/dot/3-dot-plot.png index 2a69e4f3..97c3f928 100644 Binary files a/static/examples/dot/3-dot-plot.png and b/static/examples/dot/3-dot-plot.png differ diff --git a/static/examples/dot/bubble-matrix.dark.png b/static/examples/dot/bubble-matrix.dark.png index e82f1fb2..dbd67a5b 100644 Binary files a/static/examples/dot/bubble-matrix.dark.png and b/static/examples/dot/bubble-matrix.dark.png differ diff --git a/static/examples/dot/bubble-matrix.png b/static/examples/dot/bubble-matrix.png index cdb31c2a..3027073b 100644 Binary files a/static/examples/dot/bubble-matrix.png and b/static/examples/dot/bubble-matrix.png differ diff --git a/static/examples/geo/custom-proj.dark.png b/static/examples/geo/custom-proj.dark.png index bdf6fe42..60ad5eb7 100644 Binary files a/static/examples/geo/custom-proj.dark.png and b/static/examples/geo/custom-proj.dark.png differ diff --git a/static/examples/geo/custom-proj.png b/static/examples/geo/custom-proj.png index 23cb4528..c9cbd6cb 100644 Binary files a/static/examples/geo/custom-proj.png and b/static/examples/geo/custom-proj.png differ diff --git a/static/examples/geo/earthquakes.dark.png b/static/examples/geo/earthquakes.dark.png index 45e0f719..7d8b2bc6 100644 Binary files a/static/examples/geo/earthquakes.dark.png and b/static/examples/geo/earthquakes.dark.png differ diff --git a/static/examples/geo/earthquakes.png b/static/examples/geo/earthquakes.png index 71c81b4b..042c137b 100644 Binary files a/static/examples/geo/earthquakes.png and b/static/examples/geo/earthquakes.png differ diff --git a/static/examples/geo/inset-aspect.dark.png b/static/examples/geo/inset-aspect.dark.png index c18e5f76..4a633634 100644 Binary files a/static/examples/geo/inset-aspect.dark.png and b/static/examples/geo/inset-aspect.dark.png differ diff --git a/static/examples/geo/inset-aspect.png b/static/examples/geo/inset-aspect.png index 851441b5..cfe8c987 100644 Binary files a/static/examples/geo/inset-aspect.png and b/static/examples/geo/inset-aspect.png differ diff --git a/static/examples/geo/us-choropleth-canvas.dark.png b/static/examples/geo/us-choropleth-canvas.dark.png index f2e7552e..2ca80745 100644 Binary files a/static/examples/geo/us-choropleth-canvas.dark.png and b/static/examples/geo/us-choropleth-canvas.dark.png differ diff --git a/static/examples/geo/us-choropleth-canvas.png b/static/examples/geo/us-choropleth-canvas.png index f34f4b9b..61853a51 100644 Binary files a/static/examples/geo/us-choropleth-canvas.png and b/static/examples/geo/us-choropleth-canvas.png differ diff --git a/static/examples/geo/us-choropleth.dark.png b/static/examples/geo/us-choropleth.dark.png index a22eb9da..a18badec 100644 Binary files a/static/examples/geo/us-choropleth.dark.png and b/static/examples/geo/us-choropleth.dark.png differ diff --git a/static/examples/geo/us-choropleth.png b/static/examples/geo/us-choropleth.png index f6294dd5..9ae4a9bc 100644 Binary files a/static/examples/geo/us-choropleth.png and b/static/examples/geo/us-choropleth.png differ diff --git a/static/examples/grid/clipped-gridlines.dark.png b/static/examples/grid/clipped-gridlines.dark.png index edaae493..5517a01a 100644 Binary files a/static/examples/grid/clipped-gridlines.dark.png and b/static/examples/grid/clipped-gridlines.dark.png differ diff --git a/static/examples/grid/clipped-gridlines.png b/static/examples/grid/clipped-gridlines.png index 472f9ee1..7fc472d2 100644 Binary files a/static/examples/grid/clipped-gridlines.png and b/static/examples/grid/clipped-gridlines.png differ diff --git a/static/examples/line/apple-stock.dark.png b/static/examples/line/apple-stock.dark.png index 04830bbc..29965645 100644 Binary files a/static/examples/line/apple-stock.dark.png and b/static/examples/line/apple-stock.dark.png differ diff --git a/static/examples/line/apple-stock.png b/static/examples/line/apple-stock.png index 1e9f1e9c..ffb59b59 100644 Binary files a/static/examples/line/apple-stock.png and b/static/examples/line/apple-stock.png differ diff --git a/static/examples/line/geo-line.dark.png b/static/examples/line/geo-line.dark.png index 4de9cb7b..e803a5e1 100644 Binary files a/static/examples/line/geo-line.dark.png and b/static/examples/line/geo-line.dark.png differ diff --git a/static/examples/line/geo-line.png b/static/examples/line/geo-line.png index c3bd16a1..b248c586 100644 Binary files a/static/examples/line/geo-line.png and b/static/examples/line/geo-line.png differ diff --git a/static/examples/line/gradient-line.dark.png b/static/examples/line/gradient-line.dark.png index 1f09b750..a48fa5bd 100644 Binary files a/static/examples/line/gradient-line.dark.png and b/static/examples/line/gradient-line.dark.png differ diff --git a/static/examples/line/gradient-line.png b/static/examples/line/gradient-line.png index 3ea12581..a691073c 100644 Binary files a/static/examples/line/gradient-line.png and b/static/examples/line/gradient-line.png differ diff --git a/static/examples/line/line-grouping.dark.png b/static/examples/line/line-grouping.dark.png index c18d978c..4e6badd6 100644 Binary files a/static/examples/line/line-grouping.dark.png and b/static/examples/line/line-grouping.dark.png differ diff --git a/static/examples/line/line-grouping.png b/static/examples/line/line-grouping.png index fd7ed99a..145683de 100644 Binary files a/static/examples/line/line-grouping.png and b/static/examples/line/line-grouping.png differ diff --git a/static/examples/line/tour-de-france.dark.png b/static/examples/line/tour-de-france.dark.png index b7ce05fc..ab9b9560 100644 Binary files a/static/examples/line/tour-de-france.dark.png and b/static/examples/line/tour-de-france.dark.png differ diff --git a/static/examples/line/tour-de-france.png b/static/examples/line/tour-de-france.png index f9322405..9038b611 100644 Binary files a/static/examples/line/tour-de-france.png and b/static/examples/line/tour-de-france.png differ diff --git a/static/examples/link/metros.dark.png b/static/examples/link/metros.dark.png index 09f875ab..78b67b36 100644 Binary files a/static/examples/link/metros.dark.png and b/static/examples/link/metros.dark.png differ diff --git a/static/examples/link/metros.png b/static/examples/link/metros.png index 7f815942..223ae624 100644 Binary files a/static/examples/link/metros.png and b/static/examples/link/metros.png differ diff --git a/static/examples/link/spherical-link.dark.png b/static/examples/link/spherical-link.dark.png index 9dd30c91..5f211f18 100644 Binary files a/static/examples/link/spherical-link.dark.png and b/static/examples/link/spherical-link.dark.png differ diff --git a/static/examples/link/spherical-link.png b/static/examples/link/spherical-link.png index 89d1c53b..545bbaaf 100644 Binary files a/static/examples/link/spherical-link.png and b/static/examples/link/spherical-link.png differ diff --git a/static/examples/rect/simple-rects.dark.png b/static/examples/rect/simple-rects.dark.png index 34d08ed9..280f8c6b 100644 Binary files a/static/examples/rect/simple-rects.dark.png and b/static/examples/rect/simple-rects.dark.png differ diff --git a/static/examples/rect/simple-rects.png b/static/examples/rect/simple-rects.png index 558977cc..2db03c13 100644 Binary files a/static/examples/rect/simple-rects.png and b/static/examples/rect/simple-rects.png differ diff --git a/static/examples/rect/stacked-rectx.dark.png b/static/examples/rect/stacked-rectx.dark.png index 0042b38c..8b722016 100644 Binary files a/static/examples/rect/stacked-rectx.dark.png and b/static/examples/rect/stacked-rectx.dark.png differ diff --git a/static/examples/rect/stacked-rectx.png b/static/examples/rect/stacked-rectx.png index c09f19a1..94009815 100644 Binary files a/static/examples/rect/stacked-rectx.png and b/static/examples/rect/stacked-rectx.png differ diff --git a/static/examples/rect/stacked-recty.dark.png b/static/examples/rect/stacked-recty.dark.png index c409bf8e..dc75ccf6 100644 Binary files a/static/examples/rect/stacked-recty.dark.png and b/static/examples/rect/stacked-recty.dark.png differ diff --git a/static/examples/rect/stacked-recty.png b/static/examples/rect/stacked-recty.png index a7a57ced..4aa8a0a1 100644 Binary files a/static/examples/rect/stacked-recty.png and b/static/examples/rect/stacked-recty.png differ diff --git a/static/examples/regression/cars.dark.png b/static/examples/regression/cars.dark.png index 19b4b11e..82ba5cfb 100644 Binary files a/static/examples/regression/cars.dark.png and b/static/examples/regression/cars.dark.png differ diff --git a/static/examples/regression/cars.png b/static/examples/regression/cars.png index d05d3e3a..31e6b5e5 100644 Binary files a/static/examples/regression/cars.png and b/static/examples/regression/cars.png differ diff --git a/static/examples/regression/faceted.dark.png b/static/examples/regression/faceted.dark.png index 4996eb17..8508a9c4 100644 Binary files a/static/examples/regression/faceted.dark.png and b/static/examples/regression/faceted.dark.png differ diff --git a/static/examples/regression/faceted.png b/static/examples/regression/faceted.png index af41cd2b..1db3b384 100644 Binary files a/static/examples/regression/faceted.png and b/static/examples/regression/faceted.png differ diff --git a/static/examples/regression/grouped.dark.png b/static/examples/regression/grouped.dark.png index 0c8fa20b..2a9e0a0f 100644 Binary files a/static/examples/regression/grouped.dark.png and b/static/examples/regression/grouped.dark.png differ diff --git a/static/examples/regression/grouped.png b/static/examples/regression/grouped.png index 8fbf841d..00c6ebec 100644 Binary files a/static/examples/regression/grouped.png and b/static/examples/regression/grouped.png differ diff --git a/static/examples/regression/loess.dark.png b/static/examples/regression/loess.dark.png index fa0a5bb1..52608879 100644 Binary files a/static/examples/regression/loess.dark.png and b/static/examples/regression/loess.dark.png differ diff --git a/static/examples/regression/loess.png b/static/examples/regression/loess.png index dd3c13cc..2e0e5e24 100644 Binary files a/static/examples/regression/loess.png and b/static/examples/regression/loess.png differ diff --git a/static/examples/regression/log.dark.png b/static/examples/regression/log.dark.png index 0401734b..635a96f7 100644 Binary files a/static/examples/regression/log.dark.png and b/static/examples/regression/log.dark.png differ diff --git a/static/examples/regression/log.png b/static/examples/regression/log.png index 08ef5179..7e5af521 100644 Binary files a/static/examples/regression/log.png and b/static/examples/regression/log.png differ diff --git a/static/examples/rule/data-rules.dark.png b/static/examples/rule/data-rules.dark.png index ce75cae5..36ee4a96 100644 Binary files a/static/examples/rule/data-rules.dark.png and b/static/examples/rule/data-rules.dark.png differ diff --git a/static/examples/rule/data-rules.png b/static/examples/rule/data-rules.png index cc8d02d4..3cd31eb3 100644 Binary files a/static/examples/rule/data-rules.png and b/static/examples/rule/data-rules.png differ diff --git a/static/examples/rule/min-max.dark.png b/static/examples/rule/min-max.dark.png index a7730be7..0e174800 100644 Binary files a/static/examples/rule/min-max.dark.png and b/static/examples/rule/min-max.dark.png differ diff --git a/static/examples/rule/min-max.png b/static/examples/rule/min-max.png index 892387a6..12d0bcc8 100644 Binary files a/static/examples/rule/min-max.png and b/static/examples/rule/min-max.png differ diff --git a/static/examples/rule/y-baseline.dark.png b/static/examples/rule/y-baseline.dark.png index 68b12016..040c4582 100644 Binary files a/static/examples/rule/y-baseline.dark.png and b/static/examples/rule/y-baseline.dark.png differ diff --git a/static/examples/rule/y-baseline.png b/static/examples/rule/y-baseline.png index 1f8111d9..d3154c57 100644 Binary files a/static/examples/rule/y-baseline.png and b/static/examples/rule/y-baseline.png differ diff --git a/static/examples/text/css-var.dark.png b/static/examples/text/css-var.dark.png index 54b1dd46..c787f7b9 100644 Binary files a/static/examples/text/css-var.dark.png and b/static/examples/text/css-var.dark.png differ diff --git a/static/examples/text/css-var.png b/static/examples/text/css-var.png index 65770180..c7c56306 100644 Binary files a/static/examples/text/css-var.png and b/static/examples/text/css-var.png differ