Skip to content

Commit bc6462f

Browse files
authored
Merge pull request #461 from bcgov/small_bug_fixes
fix(BCHEP-572, BCHEP-568): Button colors for Ready for training and M…
2 parents cc357bd + 1dc4ca4 commit bc6462f

File tree

3 files changed

+19
-3
lines changed

3 files changed

+19
-3
lines changed

app/frontend/components/domains/contractor-management/contractor-program-resources-screen.tsx

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -296,13 +296,14 @@ export const ContractorProgramResourcesScreen = observer(function ContractorProg
296296
as="aside"
297297
w={{ base: '100%', lg: '280px' }}
298298
flexShrink={0}
299+
overflow="visible"
299300
role="navigation"
300301
aria-label="Resource categories"
301302
id="main-content"
302303
tabIndex={-1}
303304
bg="greys.white"
304305
>
305-
<VStack align="stretch" spacing={0} role="tablist">
306+
<VStack align="stretch" spacing={0} role="tablist" overflow="visible">
306307
{SIDEBAR_CATEGORIES.map((category) => (
307308
<Box
308309
key={category.key}
@@ -332,6 +333,8 @@ export const ContractorProgramResourcesScreen = observer(function ContractorProg
332333
outline: '3px solid',
333334
outlineColor: 'theme.blue',
334335
outlineOffset: '2px',
336+
zIndex: 1,
337+
position: 'relative',
335338
}}
336339
_first={{
337340
borderTop: 'none',

app/frontend/components/domains/energy-savings-application/review-permit-application-screen.tsx

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -512,7 +512,10 @@ export const ReviewPermitApplicationScreen = observer(() => {
512512
variant="calloutInverse"
513513
px={14}
514514
onClick={onTrainingPending}
515-
borderColor="green"
515+
borderColor="theme.darkGreen"
516+
bg="theme.lightGreen"
517+
_hover={{ bg: 'theme.lightGreen' }}
518+
_active={{ bg: 'theme.lightGreen' }}
516519
isDisabled={
517520
hasUnsavedEdits ||
518521
currentPermitApplication?.status === EPermitApplicationStatus.ineligible ||
@@ -578,7 +581,10 @@ export const ReviewPermitApplicationScreen = observer(() => {
578581
leftIcon={!isEditContractor && <ProhibitIcon />}
579582
px={14}
580583
onClick={onIneligibleOpen}
581-
borderColor="red"
584+
borderColor="semantic.errorDark"
585+
bg="theme.softRose"
586+
_hover={{ bg: 'theme.softRose' }}
587+
_active={{ bg: 'theme.softRose' }}
582588
>
583589
{!isEditContractor
584590
? t('energySavingsApplication.show.inEligible')

app/frontend/components/domains/home/home-screen-box.tsx

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,13 @@ export const HomeScreenBox = observer(
5757
backgroundColor: 'theme.BlueLight',
5858
cursor: isDisabled ? 'not-allowed' : 'pointer',
5959
}}
60+
onKeyDown={(e: React.KeyboardEvent) => {
61+
if (!isDisabled && e.key === 'Enter') {
62+
e.preventDefault();
63+
const link = e.currentTarget.querySelector('a, button') as HTMLElement;
64+
link?.click();
65+
}
66+
}}
6067
{...rest}
6168
>
6269
{isMarked && <SandboxHeader />}

0 commit comments

Comments
 (0)