granblue.team/hensei-web
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'main' into staging

Browse source
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
Show stats Download patch file Download diff file Expand all files Collapse all files

9
components/party/EditPartyModal/index.tsx
View file

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

2
styles/themes.scss
View file

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