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
158 lines
3.7 KiB
Svelte
158 lines
3.7 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 type { Writable } from "svelte/store";
|
|
|
|
import * as tr from "../lib/ftl";
|
|
import { daysToRevlogRange, RevlogRange } from "./graph-helpers";
|
|
import InputBox from "./InputBox.svelte";
|
|
|
|
enum SearchRange {
|
|
Deck = 1,
|
|
Collection = 2,
|
|
Custom = 3,
|
|
}
|
|
|
|
export let loading: boolean;
|
|
|
|
export let days: Writable<number>;
|
|
export let search: Writable<string>;
|
|
|
|
let revlogRange = daysToRevlogRange($days);
|
|
let searchRange: SearchRange;
|
|
|
|
if ($search === "deck:current") {
|
|
searchRange = SearchRange.Deck;
|
|
} else if ($search === "") {
|
|
searchRange = SearchRange.Collection;
|
|
} else {
|
|
searchRange = SearchRange.Custom;
|
|
}
|
|
|
|
let displayedSearch = $search;
|
|
|
|
$: {
|
|
switch (searchRange as SearchRange) {
|
|
case SearchRange.Deck:
|
|
$search = displayedSearch = "deck:current";
|
|
break;
|
|
case SearchRange.Collection:
|
|
$search = displayedSearch = "";
|
|
break;
|
|
}
|
|
}
|
|
|
|
$: {
|
|
switch (revlogRange as RevlogRange) {
|
|
case RevlogRange.Year:
|
|
$days = 365;
|
|
break;
|
|
case RevlogRange.All:
|
|
$days = 0;
|
|
break;
|
|
}
|
|
}
|
|
|
|
function searchKeyUp(event: KeyboardEvent): void {
|
|
// fetch data on enter
|
|
if (event.code === "Enter") {
|
|
$search = displayedSearch;
|
|
}
|
|
}
|
|
|
|
const year = tr.statisticsRange_1YearHistory();
|
|
const deck = tr.statisticsRangeDeck();
|
|
const collection = tr.statisticsRangeCollection();
|
|
const searchLabel = tr.statisticsRangeSearch();
|
|
const all = tr.statisticsRangeAllHistory();
|
|
</script>
|
|
|
|
<div class="range-box">
|
|
<div class="spin" class:loading>◐</div>
|
|
|
|
<InputBox>
|
|
<label>
|
|
<input type="radio" bind:group={searchRange} value={SearchRange.Deck} />
|
|
{deck}
|
|
</label>
|
|
<label>
|
|
<input
|
|
type="radio"
|
|
bind:group={searchRange}
|
|
value={SearchRange.Collection}
|
|
/>
|
|
{collection}
|
|
</label>
|
|
|
|
<input
|
|
type="text"
|
|
bind:value={displayedSearch}
|
|
on:keyup={searchKeyUp}
|
|
on:focus={() => {
|
|
searchRange = SearchRange.Custom;
|
|
}}
|
|
placeholder={searchLabel}
|
|
/>
|
|
</InputBox>
|
|
|
|
<InputBox>
|
|
<label>
|
|
<input type="radio" bind:group={revlogRange} value={RevlogRange.Year} />
|
|
{year}
|
|
</label>
|
|
<label>
|
|
<input type="radio" bind:group={revlogRange} value={RevlogRange.All} />
|
|
{all}
|
|
</label>
|
|
</InputBox>
|
|
</div>
|
|
|
|
<div class="range-box-pad" />
|
|
|
|
<style lang="scss">
|
|
.range-box {
|
|
position: fixed;
|
|
z-index: 1;
|
|
top: 0;
|
|
width: 100%;
|
|
color: var(--fg);
|
|
background: var(--canvas);
|
|
padding: 0.5em;
|
|
|
|
@media print {
|
|
position: absolute;
|
|
}
|
|
}
|
|
|
|
@keyframes spin {
|
|
0% {
|
|
-webkit-transform: rotate(0deg);
|
|
}
|
|
100% {
|
|
-webkit-transform: rotate(360deg);
|
|
}
|
|
}
|
|
|
|
.spin {
|
|
display: inline-block;
|
|
position: absolute;
|
|
font-size: 2em;
|
|
animation: spin;
|
|
animation-duration: 1s;
|
|
animation-iteration-count: infinite;
|
|
|
|
opacity: 0;
|
|
|
|
&.loading {
|
|
opacity: 0.5;
|
|
transition: opacity 1s;
|
|
}
|
|
}
|
|
|
|
.range-box-pad {
|
|
height: 2em;
|
|
}
|
|
</style>
|