2021-04-15 15:59:52 +02:00
|
|
|
<!--
|
|
|
|
Copyright: Ankitects Pty Ltd and contributors
|
|
|
|
License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
|
|
|
|
-->
|
2021-10-26 00:43:02 +02:00
|
|
|
<script context="module" lang="ts">
|
2022-02-22 13:17:22 +01:00
|
|
|
import type { Writable } from "svelte/store";
|
|
|
|
|
2022-02-04 09:36:34 +01:00
|
|
|
import { resetAllState, updateAllState } from "../../components/WithState.svelte";
|
2022-02-03 05:52:11 +01:00
|
|
|
import type { DefaultSlotInterface } from "../../sveltelib/dynamic-slotting";
|
2021-11-05 02:29:02 +01:00
|
|
|
|
2021-04-28 13:32:25 +02:00
|
|
|
export function updateActiveButtons(event: Event) {
|
2021-04-28 14:01:55 +02:00
|
|
|
updateAllState(event);
|
2021-04-28 13:32:25 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
export function clearActiveButtons() {
|
|
|
|
resetAllState(false);
|
2021-04-07 23:53:09 +02:00
|
|
|
}
|
2021-05-05 01:22:51 +02:00
|
|
|
|
2022-08-15 05:34:16 +02:00
|
|
|
export interface RemoveFormat {
|
2022-02-22 13:17:22 +01:00
|
|
|
name: string;
|
2022-08-15 05:34:16 +02:00
|
|
|
key: string;
|
2022-02-22 13:17:22 +01:00
|
|
|
show: boolean;
|
|
|
|
active: boolean;
|
|
|
|
}
|
|
|
|
|
2021-10-19 23:09:12 +02:00
|
|
|
export interface EditorToolbarAPI {
|
2022-02-03 05:52:11 +01:00
|
|
|
toolbar: DefaultSlotInterface;
|
|
|
|
notetypeButtons: DefaultSlotInterface;
|
2022-02-22 13:17:22 +01:00
|
|
|
inlineButtons: DefaultSlotInterface;
|
|
|
|
blockButtons: DefaultSlotInterface;
|
2022-02-03 05:52:11 +01:00
|
|
|
templateButtons: DefaultSlotInterface;
|
2022-08-15 05:34:16 +02:00
|
|
|
removeFormats: Writable<RemoveFormat[]>;
|
2021-10-19 23:09:12 +02:00
|
|
|
}
|
|
|
|
|
2021-07-05 16:19:03 +02:00
|
|
|
/* Our dynamic components */
|
2021-05-06 20:29:55 +02:00
|
|
|
import AddonButtons from "./AddonButtons.svelte";
|
2021-05-06 16:10:26 +02:00
|
|
|
|
|
|
|
export const editorToolbar = {
|
2021-05-06 20:29:55 +02:00
|
|
|
AddonButtons,
|
2021-05-06 16:10:26 +02:00
|
|
|
};
|
2022-02-22 13:17:22 +01:00
|
|
|
|
|
|
|
import contextProperty from "../../sveltelib/context-property";
|
|
|
|
|
|
|
|
const key = Symbol("editorToolbar");
|
|
|
|
const [context, setContextProperty] = contextProperty<EditorToolbarAPI>(key);
|
|
|
|
|
|
|
|
export { context };
|
2021-04-07 23:53:09 +02:00
|
|
|
</script>
|
|
|
|
|
2021-10-26 00:43:02 +02:00
|
|
|
<script lang="ts">
|
2022-02-22 13:17:22 +01:00
|
|
|
import { writable } from "svelte/store";
|
|
|
|
|
2022-01-24 02:43:09 +01:00
|
|
|
import ButtonToolbar from "../../components/ButtonToolbar.svelte";
|
2022-02-03 05:52:11 +01:00
|
|
|
import DynamicallySlottable from "../../components/DynamicallySlottable.svelte";
|
2022-01-24 02:43:09 +01:00
|
|
|
import Item from "../../components/Item.svelte";
|
2022-02-22 13:17:22 +01:00
|
|
|
import BlockButtons from "./BlockButtons.svelte";
|
|
|
|
import InlineButtons from "./InlineButtons.svelte";
|
2022-02-04 09:36:34 +01:00
|
|
|
import NotetypeButtons from "./NotetypeButtons.svelte";
|
2022-09-26 01:47:50 +02:00
|
|
|
import OptionsButton from "./OptionsButton.svelte";
|
2022-05-13 05:04:20 +02:00
|
|
|
import RichTextClozeButtons from "./RichTextClozeButtons.svelte";
|
2021-04-28 02:27:38 +02:00
|
|
|
import TemplateButtons from "./TemplateButtons.svelte";
|
2021-04-27 21:01:44 +02:00
|
|
|
|
2021-10-18 14:01:15 +02:00
|
|
|
export let size: number;
|
|
|
|
export let wrap: boolean;
|
2021-05-27 15:50:49 +02:00
|
|
|
|
2022-02-22 13:17:22 +01:00
|
|
|
const toolbar = {} as DefaultSlotInterface;
|
|
|
|
const notetypeButtons = {} as DefaultSlotInterface;
|
|
|
|
const inlineButtons = {} as DefaultSlotInterface;
|
|
|
|
const blockButtons = {} as DefaultSlotInterface;
|
|
|
|
const templateButtons = {} as DefaultSlotInterface;
|
2022-08-15 05:34:16 +02:00
|
|
|
const removeFormats = writable<RemoveFormat[]>([]);
|
2021-10-19 23:09:12 +02:00
|
|
|
|
2022-02-22 13:17:22 +01:00
|
|
|
let apiPartial: Partial<EditorToolbarAPI> = {};
|
|
|
|
export { apiPartial as api };
|
2021-11-05 02:29:02 +01:00
|
|
|
|
2022-02-22 13:17:22 +01:00
|
|
|
const api: EditorToolbarAPI = Object.assign(apiPartial, {
|
2021-10-19 23:09:12 +02:00
|
|
|
toolbar,
|
|
|
|
notetypeButtons,
|
2022-02-22 13:17:22 +01:00
|
|
|
inlineButtons,
|
|
|
|
blockButtons,
|
2021-10-19 23:09:12 +02:00
|
|
|
templateButtons,
|
2022-02-22 13:17:22 +01:00
|
|
|
removeFormats,
|
2021-11-05 02:29:02 +01:00
|
|
|
} as EditorToolbarAPI);
|
2022-02-22 13:17:22 +01:00
|
|
|
|
|
|
|
setContextProperty(api);
|
2021-03-25 21:11:40 +01:00
|
|
|
</script>
|
|
|
|
|
2022-09-12 11:22:22 +02:00
|
|
|
<div class="editor-toolbar">
|
2022-02-03 05:52:11 +01:00
|
|
|
<ButtonToolbar {size} {wrap}>
|
|
|
|
<DynamicallySlottable slotHost={Item} api={toolbar}>
|
|
|
|
<Item id="notetype">
|
|
|
|
<NotetypeButtons api={notetypeButtons}>
|
|
|
|
<slot name="notetypeButtons" />
|
|
|
|
</NotetypeButtons>
|
|
|
|
</Item>
|
|
|
|
|
|
|
|
<Item id="inlineFormatting">
|
2022-02-22 13:17:22 +01:00
|
|
|
<InlineButtons api={inlineButtons} />
|
2022-02-03 05:52:11 +01:00
|
|
|
</Item>
|
|
|
|
|
|
|
|
<Item id="blockFormatting">
|
2022-02-22 13:17:22 +01:00
|
|
|
<BlockButtons api={blockButtons} />
|
2022-02-03 05:52:11 +01:00
|
|
|
</Item>
|
|
|
|
|
|
|
|
<Item id="template">
|
|
|
|
<TemplateButtons api={templateButtons} />
|
|
|
|
</Item>
|
2022-03-31 05:30:00 +02:00
|
|
|
|
|
|
|
<Item id="cloze">
|
2022-05-13 05:04:20 +02:00
|
|
|
<RichTextClozeButtons />
|
2022-03-31 05:30:00 +02:00
|
|
|
</Item>
|
2022-09-26 01:47:50 +02:00
|
|
|
|
|
|
|
<Item id="options">
|
|
|
|
<OptionsButton />
|
|
|
|
</Item>
|
2022-02-03 05:52:11 +01:00
|
|
|
</DynamicallySlottable>
|
2021-05-27 17:13:36 +02:00
|
|
|
</ButtonToolbar>
|
2022-09-12 11:22:22 +02:00
|
|
|
</div>
|
|
|
|
|
|
|
|
<style lang="scss">
|
|
|
|
.editor-toolbar {
|
|
|
|
padding: 0 0 2px;
|
|
|
|
|
|
|
|
border-width: 0 0 thin;
|
|
|
|
border-style: solid;
|
Introduce new color palette using Sass maps (#2016)
* 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
2022-09-16 06:11:18 +02:00
|
|
|
border-color: var(--border-subtle);
|
2022-09-12 11:22:22 +02:00
|
|
|
}
|
|
|
|
</style>
|