Skip to content

Commit 6a0dddd

Browse files
samhere06mohas22
andauthored
Updated theme, fullportal and reverted Semantic URL changes (#577)
Co-authored-by: mohas22 <[email protected]>
1 parent 1c868b4 commit 6a0dddd

File tree

2 files changed

+50
-13
lines changed

2 files changed

+50
-13
lines changed

src/samples/FullPortal/index.tsx

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -144,14 +144,18 @@ export default function FullPortal() {
144144
startPortal();
145145
};
146146

147-
return portalSelectionScreen ? (
147+
const content = portalSelectionScreen ? (
148148
<InvalidPortal defaultPortal={defaultPortalName} portals={availablePortals} onSelect={loadSelectedPortal} />
149149
) : (
150+
rootComponentProps && <RootComponent {...rootComponentProps} />
151+
);
152+
153+
return (
150154
<div id='pega-root'>
151155
<StyledEngineProvider injectFirst>
152156
<ThemeProvider theme={theme}>
153157
<CssBaseline />
154-
{rootComponentProps && <RootComponent {...rootComponentProps} />}
158+
{content}
155159
</ThemeProvider>
156160
</StyledEngineProvider>
157161
</div>

src/theme.ts

Lines changed: 44 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,12 @@ declare module '@mui/styles/defaultTheme' {
2020
backgroundColor: string;
2121
topColor: string;
2222
};
23+
headerNav: {
24+
backgroundColor: string;
25+
navLinkColor: string;
26+
navLinkHoverColor: string;
27+
menuToggleColor: string;
28+
};
2329
embedded: {
2430
resolutionTextColor: string;
2531
};
@@ -53,7 +59,7 @@ const lightThemeColours = {
5359
'--app-warning-color-dark': '#f57c00',
5460

5561
'--app-background-color': 'whitesmoke',
56-
'--app-form-color': 'white',
62+
'--app-form-bg-color': 'white',
5763

5864
/* App Navigation */
5965
'--app-nav-bg': '#262626' /*! default */,
@@ -75,12 +81,16 @@ const lightThemeColours = {
7581
'--selected-step-label-color': 'rgba(0, 0, 0, 0.87)',
7682
'--step-label-color': 'rgba(0, 0, 0, 0.54)',
7783
'--svg-color': 'invert(0%)',
78-
'--secondary-button-text-color': '#ffffff'
84+
'--secondary-button-text-color': '#ffffff',
85+
86+
'--text-primary-color': '#000',
87+
'--text-secondary-color': '#c0c0c0',
88+
'--stepper-completed-bg-color': '#218721'
7989
}
8090
};
8191
const darkThemeColours = {
8292
':root': {
83-
'--app-primary-color': '#f72585' /* accent pink */,
93+
'--app-primary-color': '#C70BB5' /* accent pink */,
8494
'--app-primary-dark-color': '#c2185b' /* darker pink */,
8595
'--app-primary-light-color': '#ff5ca2' /* lighter pink */,
8696
'--app-secondary-color': '#c0c0c0' /* accent silver */,
@@ -95,7 +105,7 @@ const darkThemeColours = {
95105
'--app-warning-color-dark': '#c68400' /* dark amber */,
96106

97107
'--app-background-color': '#060326' /* main dark background */,
98-
'--app-form-color': '#18132c' /* slightly lighter for forms */,
108+
'--app-form-bg-color': '#23273f' /* slightly lighter for forms */,
99109

100110
/* App Navigation */
101111
'--app-nav-bg': '#18132c' /* navigation background */,
@@ -117,7 +127,11 @@ const darkThemeColours = {
117127
'--selected-step-label-color': 'rgba(0, 0, 0, 0.87)',
118128
'--step-label-color': 'rgba(0, 0, 0, 0.54)',
119129
'--svg-color': 'invert(100%)',
120-
'--secondary-button-text-color': '#1a103c'
130+
'--secondary-button-text-color': '#1a103c',
131+
132+
'--text-primary-color': '#e0e0e0',
133+
'--text-secondary-color': '#c0c0c0',
134+
'--stepper-completed-bg-color': '#158715'
121135
}
122136
};
123137

@@ -139,6 +153,12 @@ const lightTheme = createTheme({
139153
}
140154
}
141155
},
156+
headerNav: {
157+
backgroundColor: '#ffffff',
158+
navLinkColor: 'rgba(0, 0, 0, 0.87)',
159+
navLinkHoverColor: '#3f51b5',
160+
menuToggleColor: 'rgba(0, 0, 0, 0.87)'
161+
},
142162
actionButtons: {
143163
primary: {
144164
backgroundColor: '#cc0f60',
@@ -187,7 +207,13 @@ const darkTheme = createTheme({
187207
background: 'radial-gradient(178.62% 112% at 50% -12%, #0B0F2A 69.96%, #111951 89.19%)',
188208
backgroundAttachment: 'fixed'
189209
},
190-
...darkThemeColours
210+
...darkThemeColours,
211+
212+
// scrollbar styling
213+
'*': {
214+
scrollbarWidth: 'thin', // Options: auto | thin | none
215+
scrollbarColor: '#555 #2c2c2c' // thumb color, track color
216+
}
191217
}
192218
},
193219
MuiPaper: {
@@ -206,6 +232,12 @@ const darkTheme = createTheme({
206232
}
207233
}
208234
},
235+
headerNav: {
236+
backgroundColor: 'var(--app-nav-bg)',
237+
navLinkColor: 'var(--app-nav-color)',
238+
navLinkHoverColor: '#ffffff',
239+
menuToggleColor: '#ffffff'
240+
},
209241
actionButtons: {
210242
primary: {
211243
backgroundColor: '#C70BB5',
@@ -228,8 +260,8 @@ const darkTheme = createTheme({
228260
palette: {
229261
mode: 'dark',
230262
primary: {
231-
main: '#f72585', // accent pink
232-
light: '#ff5ca2', // lighter shade of pink
263+
main: '#C70BB5', // pink
264+
light: '#C70BB5', // pink
233265
dark: '#c2185b', // darker shade
234266
contrastText: '#ffffff' // white text on pink buttons
235267
},
@@ -241,13 +273,14 @@ const darkTheme = createTheme({
241273
},
242274
info: {
243275
main: '#e91e63', // Pink
244-
dark: '#ad1457', // Darker pink
245-
light: '#f8bbd0', // Light pink for backgrounds
276+
dark: '#E885D2', // Light pink
277+
light: '#C70BB5', // Lighter pink for backgrounds
246278
contrastText: '#fff'
247279
},
248280
background: {
249281
// default: 'radial-gradient(178.62% 112% at 50% -12%, #0B0F2A 69.96%, #111951 89.19%)',
250-
paper: 'rgba(255, 255, 255, 0.1)' // card-bg
282+
// paper: '#18132c'
283+
paper: '#191b2c' // card-bg
251284
},
252285
text: {
253286
primary: '#e0e0e0', // text-light

0 commit comments

Comments
 (0)