-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'develop' of https://github.com/leemonade/bubbles into d…
…evelop
- Loading branch information
Showing
58 changed files
with
1,096 additions
and
147 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
6 changes: 3 additions & 3 deletions
6
packages/components/src/informative/ActivityAnswersBar/CustomLegend/CustomLegend.styles.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,10 +1,10 @@ | ||
| import { createStyles } from '@mantine/styles'; | ||
| import { pxToRem, getPaddings, getFontExpressive, getFontProductive } from '../../../theme.mixins'; | ||
|
|
||
| export const CustomLegendStyles = createStyles((theme, {}) => { | ||
| return { | ||
| root: {}, | ||
| legendIcon: { color: theme.colors.mainWhite }, | ||
| legendSlash: { fill: theme.colors.mainWhite, fontWeight: 600, fontSize: pxToRem(17) }, | ||
| legendIconOK: { color: '#5CBC6A' }, | ||
| legendIconKO: { color: '#D13B3B' }, | ||
| legendIconSlash: { color: '#4D5358' }, | ||
| }; | ||
| }); |
16 changes: 8 additions & 8 deletions
16
packages/components/src/informative/SortableList/SortableList.styles.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,10 +1,10 @@ | ||
| import { createStyles } from '@mantine/styles'; | ||
|
|
||
| export const SortableListStyles = createStyles((theme, {}) => { | ||
| return { | ||
| sortableIcon: { | ||
| height: theme.spacing[3], | ||
| color: theme.colors.text02, | ||
| }, | ||
| }; | ||
| }); | ||
| const SortableListStyles = createStyles((theme, {}) => ({ | ||
| sortableIcon: { | ||
| height: 16, | ||
| color: theme.other.buttonAction.content.color.primary.default, | ||
| }, | ||
| })); | ||
|
|
||
| export { SortableListStyles }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
15 changes: 15 additions & 0 deletions
15
packages/components/src/layout/VerticalContainer/VerticalContainer.constants.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| import PropTypes from 'prop-types'; | ||
|
|
||
| export const VERTICAL_CONTAINER_DEFAULT_PROPS = { | ||
| disableContentPadding: false, | ||
| navWidth: 276, | ||
| stickyAt: 0, | ||
| legible: true, | ||
| }; | ||
| export const VERTICAL_CONTAINER_PROP_TYPES = { | ||
| padding: PropTypes.number, | ||
| disableContentPadding: PropTypes.bool, | ||
| navWidth: PropTypes.oneOfType([PropTypes.number, PropTypes.string]), | ||
| stickyAt: PropTypes.number, | ||
| legible: PropTypes.bool, | ||
| }; |
37 changes: 37 additions & 0 deletions
37
packages/components/src/layout/VerticalContainer/VerticalContainer.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,37 @@ | ||
| import React, { forwardRef } from 'react'; | ||
| import { VerticalContainerStyles } from './VerticalContainer.styles'; | ||
| import { Box } from '../Box'; | ||
| import { Stack } from '../Stack'; | ||
| import { | ||
| VERTICAL_CONTAINER_DEFAULT_PROPS, | ||
| VERTICAL_CONTAINER_PROP_TYPES, | ||
| } from './VerticalContainer.constants'; | ||
|
|
||
| const VerticalContainer = forwardRef(({ children, scrollRef, leftZone, ...props }, ref) => { | ||
| const { classes } = VerticalContainerStyles({ name: 'VerticalStepperContainer' }); | ||
|
|
||
| return ( | ||
| <Box ref={ref} className={classes.root}> | ||
| <Stack | ||
| ref={scrollRef} | ||
| justifyContent="center" | ||
| fullWidth | ||
| fullHeight | ||
| style={{ | ||
| backgroundColor: '#f8f9fb', | ||
| overflow: 'auto', | ||
| position: 'relative', | ||
| }} | ||
| > | ||
| <Box className={classes.stepper}>{leftZone}</Box> | ||
| <Box className={classes.content}>{children}</Box> | ||
| </Stack> | ||
| </Box> | ||
| ); | ||
| }); | ||
|
|
||
| VerticalContainer.displayName = 'VerticalContainer'; | ||
| VerticalContainer.defaultProps = VERTICAL_CONTAINER_DEFAULT_PROPS; | ||
| VerticalContainer.propTypes = VERTICAL_CONTAINER_PROP_TYPES; | ||
|
|
||
| export { VerticalContainer }; |
Oops, something went wrong.