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
111 lines
3.1 KiB
Svelte
111 lines
3.1 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 Modal from "bootstrap/js/dist/modal";
|
|
import { getContext, onDestroy, onMount } from "svelte";
|
|
|
|
import { modalsKey } from "../components/context-keys";
|
|
import { pageTheme } from "../sveltelib/theme";
|
|
|
|
export let title: string;
|
|
export let prompt: string;
|
|
export let value = "";
|
|
export let onOk: (text: string) => void;
|
|
|
|
export const modalKey: string = Math.random().toString(36).substring(2);
|
|
|
|
const modals = getContext<Map<string, Modal>>(modalsKey);
|
|
|
|
let modalRef: HTMLDivElement;
|
|
let modal: Modal;
|
|
|
|
let inputRef: HTMLInputElement;
|
|
|
|
function onOkClicked(): void {
|
|
onOk(inputRef.value);
|
|
modal.hide();
|
|
value = "";
|
|
}
|
|
|
|
function onShown(): void {
|
|
inputRef.focus();
|
|
}
|
|
|
|
onMount(() => {
|
|
modalRef.addEventListener("shown.bs.modal", onShown);
|
|
modal = new Modal(modalRef);
|
|
modals.set(modalKey, modal);
|
|
});
|
|
|
|
onDestroy(() => {
|
|
modalRef.removeEventListener("shown.bs.modal", onShown);
|
|
});
|
|
</script>
|
|
|
|
<div
|
|
bind:this={modalRef}
|
|
class="modal fade"
|
|
tabindex="-1"
|
|
aria-labelledby="modalLabel"
|
|
aria-hidden="true"
|
|
>
|
|
<div class="modal-dialog">
|
|
<div class="modal-content" class:default-colors={$pageTheme.isDark}>
|
|
<div class="modal-header">
|
|
<h5 class="modal-title" id="modalLabel">{title}</h5>
|
|
<button
|
|
type="button"
|
|
class="btn-close"
|
|
class:invert={$pageTheme.isDark}
|
|
data-bs-dismiss="modal"
|
|
aria-label="Close"
|
|
/>
|
|
</div>
|
|
<div class="modal-body">
|
|
<form on:submit|preventDefault={onOkClicked}>
|
|
<div class="mb-3">
|
|
<label for="prompt-input" class="col-form-label"
|
|
>{prompt}:</label
|
|
>
|
|
<input
|
|
id="prompt-input"
|
|
bind:this={inputRef}
|
|
type="text"
|
|
class:nightMode={$pageTheme.isDark}
|
|
class="form-control"
|
|
bind:value
|
|
/>
|
|
</div>
|
|
</form>
|
|
</div>
|
|
<div class="modal-footer">
|
|
<button type="button" class="btn btn-secondary" data-bs-dismiss="modal"
|
|
>Cancel</button
|
|
>
|
|
<button type="button" class="btn btn-primary" on:click={onOkClicked}
|
|
>OK</button
|
|
>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
|
|
<style lang="scss">
|
|
@use "sass/night-mode" as nightmode;
|
|
|
|
.nightMode {
|
|
@include nightmode.input;
|
|
}
|
|
|
|
.default-colors {
|
|
background-color: var(--canvas);
|
|
color: var(--fg);
|
|
}
|
|
|
|
.invert {
|
|
filter: invert(1) grayscale(100%) brightness(200%);
|
|
}
|
|
</style>
|