8142176f84
* Remove --medium-border variable * Implement color palette using Sass maps I hand-picked the gray tones, the other colors are from the Tailwind CSS v3 palette. Significant changes: - light theme is brighter - dark theme is darker - borders are softer I also deleted some platform- and night-mode-specific code. * Use custom colors for note view switch * Use same placeholder color for all inputs * Skew color palette for more dark values by removing gray[3], which wasn't used anywhere. Slight adjustments were made to the darker tones. * Adjust frame- window- and border colors * Give deck browser entries --frame-bg as background color * Define styling for QComboBox and QLineEdit globally * Experiment with CSS filter for inline-colors Inside darker inputs, some colors like dark blue will be hard to read, so we could try to improve text-color contrast with global adjustments depending on the theme. * Use different map structure for _vars.scss after @hgiesel's idea: https://github.com/ankitects/anki/pull/2016#discussion_r947087871 * Move custom QLineEdit styles out of searchbar.py * Merge branch 'main' into color-palette * Revert QComboBox stylesheet override * Align gray color palette more with macOS * Adjust light theme * Use --slightly-grey-text for options tab color * Replace gray tones with more neutral values * Improve categorization of global colors by renaming almost all of them and sorting them into separate maps. * Saturate highlight-bg in light theme * Tweak gray tones * Adjust box-shadow of EditingArea to make fields look inset * Add Sass functions to access color palette and semantic variables in response to https://github.com/ankitects/anki/pull/2016#issuecomment-1220571076 * Showcase use of access functions in several locations @hgiesel in buttons.scss I access the color palette directly. Is this what you meant by "... keep it local to the component, and possibly make it global at a later time ..."? * Fix focus box shadow transition and remove default shadow for a cleaner look I couldn't quite get the inset look the way I wanted, because inset box-shadows do not respect the border radius, therefore causing aliasing. * Tweak light theme border and shadow colors * Add functions and colors to base_lib * Add vars_lib as dependency to base_lib and button_mixins_lib * Improve uses of default-themed variables * Use old --frame-bg color and use darker tone for canvas-default * Return CSS var by default and add palette-of function for raw value * Showcase use of palette-of function The #{...} syntax is required only because the use cases are CSS var definitions. In other cases a simple palette-of(keyword, theme) would suffice. * Light theme: decrease brightness of canvas-default and adjust fg-default * Use canvas-inset variable for switch knob * Adjust light theme * Add back box-shadow to EditingArea * Light theme: darken background and flatten transition also set hue and saturation of gray-8 to 0 (like all the other grays). * Reduce flag colors to single default value * Tweak card/note accent colors * Experiment with inset look for fields again Is this too dark in night mode? It's the same color used for all other text inputs. * Dark theme: make border-default one shade darker * Tweak inset shadow color * Dark theme: make border-faint darker than canvas-default meaning two shades darker than it currently was. * Fix PlainTextInput not expanding * Dark theme: use less saturated flag colors * Adjust gray tones * Fix nested variables not getting extracted correctly * Rename canvas-outset to canvas-elevated * Light theme: darken canvas-default * Make canvas-elevated a bit darker * Rename variables and use them in various components * Refactor button mixins * Remove fusion vars from Anki * Adjust button gradients * Refactor button mixins * Fix deck browser table td background color * Use color function in buttons.scss * Rework QTabWidget stylesheet * Fix crash on browser open * Perfect QTableView header * Fix bottom toolbar button gradient * Fix focus outline of bottom toolbar buttons * Fix custom webview scrollbar * Fix uses of vars in various webviews The command @use vars as * lead to repeated inclusion of the CSS vars. * Enable primary button color with mixin * Run prettier * Fix Python code style issues * Tweak colors * Lighten scrollbar shades in light theme * Fix code style issues caused by merge * Fix harsh border color in editor caused by leftover --medium-border variables, probably introduced with a merge commit. * Compile Sass before extracting Python colors/props This means the Python side doesn't need to worry about the map structure and Sass functions, just copy the output CSS values. * Desaturate primary button colors by 10% * Convert accidentally capitalized variable names to lowercase * Simplify color definitions with qcolor function * Remove default border-focus variable * Remove redundant colon * Apply custom scrollbar CSS only on Windows and Linux * Make border-subtle color brighter than background in dark theme * Make border-subtle color a shade brighter in light theme * Use border-subtle for NoteEditor and EditorToolbar border * Small patches
150 lines
4.4 KiB
Svelte
150 lines
4.4 KiB
Svelte
<!--
|
|
Copyright: Ankitects Pty Ltd and contributors
|
|
License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
|
|
-->
|
|
<script lang="ts">
|
|
import { createEventDispatcher } from "svelte";
|
|
|
|
import * as tr2 from "../lib/ftl";
|
|
import type { Stats } from "../lib/proto";
|
|
import type { PreferenceStore } from "../sveltelib/preferences";
|
|
import type { GraphData, TableDatum } from "./card-counts";
|
|
import { gatherData, renderCards } from "./card-counts";
|
|
import Graph from "./Graph.svelte";
|
|
import type { SearchEventMap } from "./graph-helpers";
|
|
import { defaultGraphBounds } from "./graph-helpers";
|
|
import InputBox from "./InputBox.svelte";
|
|
|
|
export let sourceData: Stats.GraphsResponse;
|
|
export let preferences: PreferenceStore<Stats.GraphPreferences>;
|
|
|
|
const { cardCountsSeparateInactive, browserLinksSupported } = preferences;
|
|
const dispatch = createEventDispatcher<SearchEventMap>();
|
|
|
|
let svg = null as HTMLElement | SVGElement | null;
|
|
|
|
const bounds = defaultGraphBounds();
|
|
bounds.width = 225;
|
|
bounds.marginBottom = 0;
|
|
|
|
let graphData = null as unknown as GraphData;
|
|
let tableData = null as unknown as TableDatum[];
|
|
|
|
$: {
|
|
graphData = gatherData(sourceData, $cardCountsSeparateInactive);
|
|
tableData = renderCards(svg as any, bounds, graphData);
|
|
}
|
|
|
|
const label = tr2.statisticsCountsSeparateSuspendedBuriedCards();
|
|
const total = tr2.statisticsCountsTotalCards();
|
|
</script>
|
|
|
|
<Graph title={graphData.title}>
|
|
<InputBox>
|
|
<label>
|
|
<input type="checkbox" bind:checked={$cardCountsSeparateInactive} />
|
|
{label}
|
|
</label>
|
|
</InputBox>
|
|
|
|
<div class="counts-outer">
|
|
<div class="svg-container" width={bounds.width} height={bounds.height}>
|
|
<svg
|
|
bind:this={svg}
|
|
viewBox={`0 0 ${bounds.width} ${bounds.height}`}
|
|
style="opacity: {graphData.totalCards ? 1 : 0}"
|
|
>
|
|
<g class="counts" />
|
|
</svg>
|
|
</div>
|
|
<div class="counts-table">
|
|
<table>
|
|
{#each tableData as d, _idx}
|
|
<tr>
|
|
<!-- prettier-ignore -->
|
|
<td>
|
|
<span style="color: {d.colour};">■ </span>
|
|
{#if browserLinksSupported}
|
|
<span class="search-link" on:click={() => dispatch('search', { query: d.query })}>{d.label}</span>
|
|
{:else}
|
|
<span>{d.label}</span>
|
|
{/if}
|
|
</td>
|
|
<td class="right">{d.count}</td>
|
|
<td class="right">{d.percent}</td>
|
|
</tr>
|
|
{/each}
|
|
|
|
<tr>
|
|
<td><span style="visibility: hidden;">■</span> {total}</td>
|
|
<td class="right">{graphData.totalCards}</td>
|
|
<td />
|
|
</tr>
|
|
</table>
|
|
</div>
|
|
</div>
|
|
</Graph>
|
|
|
|
<style lang="scss">
|
|
svg {
|
|
transition: opacity 1s;
|
|
}
|
|
|
|
.counts-outer {
|
|
display: flex;
|
|
justify-content: center;
|
|
margin: 0 4vw;
|
|
|
|
.svg-container {
|
|
width: 225px;
|
|
}
|
|
|
|
.counts-table {
|
|
display: flex;
|
|
flex-direction: column;
|
|
justify-content: center;
|
|
|
|
table {
|
|
border-spacing: 1em 0;
|
|
padding-left: 4vw;
|
|
|
|
td {
|
|
white-space: nowrap;
|
|
padding: 0 min(4vw, 40px);
|
|
|
|
&.right {
|
|
text-align: right;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
/* On narrow devices, stack graph and table in a column */
|
|
@media only screen and (max-width: 600px) {
|
|
.counts-outer {
|
|
display: flex;
|
|
flex-direction: column;
|
|
align-items: center;
|
|
|
|
.svg-container {
|
|
width: 180px;
|
|
|
|
svg {
|
|
margin-left: 4vw;
|
|
}
|
|
}
|
|
|
|
.counts-table table td {
|
|
padding: 0 min(6vw, 30px);
|
|
}
|
|
}
|
|
}
|
|
|
|
.search-link:hover {
|
|
cursor: pointer;
|
|
color: var(--accent-link);
|
|
text-decoration: underline;
|
|
}
|
|
</style>
|