diff --git a/package.json b/package.json index b0a3232..2eddec4 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "life-trinket", "private": true, - "version": "0.9.94", + "version": "0.9.95", "type": "commonjs", "engines": { "node": ">=20", diff --git a/src/Components/Buttons/ExtraCounter.tsx b/src/Components/Buttons/ExtraCounter.tsx index ccc9f9c..d5cb409 100644 --- a/src/Components/Buttons/ExtraCounter.tsx +++ b/src/Components/Buttons/ExtraCounter.tsx @@ -29,7 +29,7 @@ const ExtraCounterButton = twc.button` `; const IconContainer = twc.div((props) => [ - 'w-auto', + 'w-auto opacity-50', props.$rotation === Rotation.SideFlipped || props.$rotation === Rotation.Side ? 'rotate-[-90deg]' : '', @@ -38,7 +38,7 @@ const IconContainer = twc.div((props) => [ const TextContainer = twc.div` absolute top-1/2 - left-1/2 + left-1/2 `; type ExtraCounterProps = { @@ -126,18 +126,16 @@ const ExtraCounter = ({ }} aria-label={`Player ${playerIndex} extra counter: ${type}`} > - - {Icon} - - - {counterTotal ? counterTotal : undefined} - - - + {Icon} + + + {counterTotal ? counterTotal : undefined} + + ); diff --git a/src/Components/Buttons/LifeCounterButton.tsx b/src/Components/Buttons/LifeCounterButton.tsx index a5743f5..e4ecf6f 100644 --- a/src/Components/Buttons/LifeCounterButton.tsx +++ b/src/Components/Buttons/LifeCounterButton.tsx @@ -23,6 +23,7 @@ const LifeCounterButtonTwc = twc.button` items-center select-none webkit-user-select-none + opacity-50 `; const TextContainer = twc.div((props) => [ diff --git a/src/Components/Counters/ExtraCountersBar.tsx b/src/Components/Counters/ExtraCountersBar.tsx index 038ad63..792cd9d 100644 --- a/src/Components/Counters/ExtraCountersBar.tsx +++ b/src/Components/Counters/ExtraCountersBar.tsx @@ -21,7 +21,7 @@ const Container = twc.div((props) => [ ]); export const ExtraCountersGrid = twc.div((props) => [ - 'flex absolute flex-row flex-grow pointer-events-none overflow-x-scroll overflow-y-hidden', + 'flex absolute flex-row flex-grow pointer-events-none overflow-x-scroll overflow-y-hidden ', props.$rotation === Rotation.SideFlipped || props.$rotation === Rotation.Side ? 'flex-col-reverse h-full w-auto bottom-auto right-0' : 'w-full bottom-0', @@ -110,6 +110,8 @@ const ExtraCountersBar = ({ player }: ExtraCountersBarProps) => { } diff --git a/src/Components/Dialogs/InfoDialog.tsx b/src/Components/Dialogs/InfoDialog.tsx index c7ef51b..eb15913 100644 --- a/src/Components/Dialogs/InfoDialog.tsx +++ b/src/Components/Dialogs/InfoDialog.tsx @@ -1,4 +1,11 @@ import { useAnalytics } from '../../Hooks/useAnalytics'; +import { + CommanderTax, + Energy, + Experience, + PartnerTax, + Poison, +} from '../../Icons/generated'; import { BuyMeCoffee } from '../../Icons/generated/Support'; import { Separator } from '../Misc/Separator'; import { Paragraph } from '../Misc/TextComponents'; @@ -16,7 +23,35 @@ export const InfoDialog = ({

Contributors

{/* */} - Elin: Icon design +
+
+ + Vikeo + + : Creator +
+
+ + Elin + + : Icon design +
+
+
+
+ Visit the{' '} + + GitHub + {' '} + to contribute or learn more about this web app.
@@ -56,6 +91,25 @@ export const InfoDialog = ({ +

Other counter symbols

+
    +
  • + - Commander Tax +
  • +
  • + - Partner Tax +
  • +
  • + - Poison +
  • +
  • + - Energy +
  • +
  • + - Experience +
  • +
+

Other functionality

  • @@ -74,20 +128,24 @@ export const InfoDialog = ({
+ +

Acknowledgements

+ + LifeTrinket is unofficial Fan Content permitted under the{' '} + + Fan Content Policy + + . Not approved or endorsed by Wizards. Portions of the material or + concepts, such as "Commander", used are property of Wizards of the + Coast. ©Wizards of the Coast LLC. + -
- Visit my{' '} - - GitHub - {' '} - for more info about this web app. -
((props) => [ - 'absolute flex-grow border-none outline-none cursor-pointer bg-transparent z-[1] select-none webkit-user-select-none', + 'absolute flex-grow border-none outline-none cursor-pointer bg-transparent z-[1] select-none webkit-user-select-none opacity-50', props.$rotation === Rotation.Side || props.$rotation === Rotation.SideFlipped ? `right-auto top-[1vmax] left-[27%]` : 'top-1/4 right-[1vmax]', diff --git a/src/Components/Misc/TextComponents.tsx b/src/Components/Misc/TextComponents.tsx index 18de48c..95b609e 100644 --- a/src/Components/Misc/TextComponents.tsx +++ b/src/Components/Misc/TextComponents.tsx @@ -1,6 +1,6 @@ import { twc } from 'react-twc'; -export const Paragraph = twc.p`text-text-primary;`; +export const Paragraph = twc.p`text-text-primary`; // eslint-disable-next-line react-refresh/only-export-components export const H1 = twc.h1`text-text-primary;`; diff --git a/src/Components/Players/PlayerMenu.tsx b/src/Components/Players/PlayerMenu.tsx index c178c2d..a77a5fa 100644 --- a/src/Components/Players/PlayerMenu.tsx +++ b/src/Components/Players/PlayerMenu.tsx @@ -24,8 +24,7 @@ const PlayerMenuWrapper = twc.div` flex flex-col absolute - w-full - h-full + size-full bg-background-settings backdrop-blur-[3px] items-center @@ -223,7 +222,7 @@ const PlayerMenu = ({ size={extraCountersSize} color="black" stroke="white" - strokeWidth="30" + strokeWidth="1" /> } checkedIcon={ @@ -231,7 +230,9 @@ const PlayerMenu = ({ size={extraCountersSize} color={player.color} stroke="white" - strokeWidth="30" + strokeWidth="1" + strokeLinejoin="round" + strokeLinecap="round" /> } onChange={(e) => { @@ -254,7 +255,7 @@ const PlayerMenu = ({ size={extraCountersSize} color="black" stroke="white" - strokeWidth="30" + strokeWidth="2" /> } checkedIcon={ @@ -262,7 +263,9 @@ const PlayerMenu = ({ size={extraCountersSize} color={player.color} stroke="white" - strokeWidth="30" + strokeWidth="2" + strokeLinejoin="round" + strokeLinecap="round" /> } onChange={(e) => { @@ -284,7 +287,7 @@ const PlayerMenu = ({ size={extraCountersSize} color="black" stroke="white" - strokeWidth="15" + strokeWidth={2.2} /> } checkedIcon={ @@ -292,7 +295,7 @@ const PlayerMenu = ({ size={extraCountersSize} color={player.color} stroke="white" - strokeWidth="15" + strokeWidth={2.2} /> } onChange={(e) => { @@ -314,7 +317,7 @@ const PlayerMenu = ({ size={extraCountersSize} color="black" stroke="white" - strokeWidth="15" + strokeWidth={2.5} /> } checkedIcon={ @@ -322,7 +325,7 @@ const PlayerMenu = ({ size={extraCountersSize} color={player.color} stroke="white" - strokeWidth="15" + strokeWidth={2.5} /> } onChange={(e) => { diff --git a/tailwind.config.ts b/tailwind.config.ts index 3e13026..4e15909 100644 --- a/tailwind.config.ts +++ b/tailwind.config.ts @@ -18,8 +18,8 @@ export const baseColors = { settings: 'rgba(0, 0, 0, 0.8)', }, icons: { - dark: '#00000080', - light: '#F9FFE34f', + dark: '#000000', + light: '#F9FFE3', }, text: { primary: '#F9FFE3',