Skip to content

Commit 9be3154

Browse files
authored
Merge pull request #3998 from Emurgo/fix/YOEXT-1969
fix: gobal horizontall scrollbar style
2 parents c94102a + 8cdbd19 commit 9be3154

File tree

2 files changed

+16
-6
lines changed

2 files changed

+16
-6
lines changed

packages/yoroi-extension/app/UI/features/transaction-review/useCases/ReviewTx/Metadata/MetadataTab.tsx

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,21 @@ export const MetadataTab = ({ hash, metadata }) => {
2828
sx={{
2929
overflow: 'auto',
3030
whiteSpace: 'pre-wrap',
31-
wordBreak: 'break-word',
31+
wordBreak: 'break-all',
3232
padding: '8px',
3333
borderRadius: '4px',
34+
maxWidth: '100%',
3435
}}
3536
>
36-
<Typography variant="body1" component="pre">
37+
<Typography
38+
variant="body1"
39+
component="pre"
40+
sx={{
41+
margin: 0,
42+
whiteSpace: 'pre-wrap',
43+
wordBreak: 'break-all',
44+
}}
45+
>
3746
{metadata ? JSON.stringify(metadata, null, 2) : strings.missingMetadata}
3847
</Typography>
3948
</Box>

packages/yoroi-extension/app/styles/globalStyles.js

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -290,12 +290,12 @@ export function getMainYoroiPalette(theme: ColorPaletteForStyles): { [string]: s
290290
'--toastify-color-warning': '#f1c40f',
291291
'--toastify-color-error': 'hsl(6, 78%, 57%)',
292292
'--toastify-color-transparent': 'rgba(255, 255, 255, 0.7)',
293-
293+
294294
'--toastify-icon-color-info': 'var(--toastify-color-info)',
295295
'--toastify-icon-color-success': 'var(--toastify-color-success)',
296296
'--toastify-icon-color-warning': 'var(--toastify-color-warning)',
297297
'--toastify-icon-color-error': 'var(--toastify-color-error)',
298-
298+
299299
'--toastify-container-width': 'fit-content',
300300
'--toastify-toast-width': '446px',
301301
'--toastify-toast-offset': '16px',
@@ -313,13 +313,13 @@ export function getMainYoroiPalette(theme: ColorPaletteForStyles): { [string]: s
313313
'--toastify-z-index': '9999',
314314
'--toastify-text-color-light': '#757575',
315315
'--toastify-text-color-dark': '#fff',
316-
316+
317317
/* Used only for colored theme */
318318
'--toastify-text-color-info': '#fff',
319319
'--toastify-text-color-success': '#fff',
320320
'--toastify-text-color-warning': '#fff',
321321
'--toastify-text-color-error': '#fff',
322-
322+
323323
'--toastify-spinner-color': '#616161',
324324
'--toastify-spinner-color-empty-area': '#e0e0e0',
325325
'--toastify-color-progress-light': 'linear-gradient(to right, #4cd964, #5ac8fa, #007aff, #34aadc, #5856d6, #ff2d55)',
@@ -387,6 +387,7 @@ const globalStyles = (theme: Object): Node => {
387387
boxSizing: 'border-box',
388388
'&::-webkit-scrollbar': {
389389
width: '20px',
390+
height: '20px',
390391
},
391392
'&::-webkit-scrollbar-track': {
392393
backgroundColor: 'transparent',

0 commit comments

Comments
 (0)