Merge branch 'main' into staging

This commit is contained in:
Justin Edmund 2023-07-06 02:55:46 -07:00 committed by GitHub
commit 8f7670c07b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 1 deletions

View file

@ -476,6 +476,15 @@ const EditPartyModal = ({
/>
)
const editorField = (
<Editor
bound={true}
content={description}
editable={true}
onUpdate={handleEditorUpdate}
/>
)
const chargeAttackField = (
<SwitchTableField
name="charge_attack"

View file

@ -63,7 +63,7 @@
--toolbar-item-text-hover: #{$toolbar--item--text--light--hover};
--toolbar-item-text-active: #{$toolbar--item--text--light--active};
// Dark - Highlights
// Light - Highlights
--highlight-bg: #{$highlight--bg--light};
--highlight-bg-hover: #{$highlight--bg--light--hover};
--highlight-text: #{$highlight--text--light};