Skip to content

Commit

Permalink
Merge branch 'develop' of https://github.com/leemonade/bubbles into d…
Browse files Browse the repository at this point in the history
…evelop
  • Loading branch information
Cerberupo committed Jan 5, 2024
2 parents 30924a2 + 85f9a85 commit d43a622
Show file tree
Hide file tree
Showing 36 changed files with 355 additions and 62 deletions.
36 changes: 36 additions & 0 deletions packages/calendars/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,41 @@
# @bubbles-ui/calendars

## 1.2.96

### Patch Changes

- Versions bump
- Updated dependencies
- @bubbles-ui/components@1.2.96
- @bubbles-ui/icons@1.2.96

## 1.2.95

### Patch Changes

- Versions bump
- Updated dependencies
- @bubbles-ui/components@1.2.95
- @bubbles-ui/icons@1.2.95

## 1.2.94

### Patch Changes

- Versions bump
- Updated dependencies
- @bubbles-ui/components@1.2.94
- @bubbles-ui/icons@1.2.94

## 1.2.93

### Patch Changes

- Versions bump
- Updated dependencies
- @bubbles-ui/components@1.2.93
- @bubbles-ui/icons@1.2.93

## 1.2.92

### Patch Changes
Expand Down
6 changes: 3 additions & 3 deletions packages/calendars/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@bubbles-ui/calendars",
"version": "1.2.92",
"version": "1.2.96",
"description": "The Bubbles Design System is Leemonade's open-source design system for products and experiences.",
"main": "lib/index.js",
"module": "es/index.js",
Expand Down Expand Up @@ -59,8 +59,8 @@
"rrule": "^2.6.8"
},
"peerDependencies": {
"@bubbles-ui/components": "^1.2.92",
"@bubbles-ui/icons": "^1.2.92",
"@bubbles-ui/components": "^1.2.96",
"@bubbles-ui/icons": "^1.2.96",
"react": "^17.0.1",
"react-dom": "^17.0.1",
"webpack": "*"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,25 +1,24 @@
/* eslint-disable import/prefer-default-export */
import { createStyles, getFontExpressive, getBoxShadowFromToken } from '@bubbles-ui/components';

export const ToolbarStyles = createStyles((theme, {}, getRef) => {
export const ToolbarStyles = createStyles((theme, {}, getRef) => {
const scTheme = theme.other?.segmentedControl ?? {};
console.log('scTheme:', scTheme);
return {
root: {},
todayButton: {
maxHeight: 40,
overflowY: 'hidden',
paddingTop: '9px !important'
paddingTop: '9px !important',
},
viewItemLabel: {
...(scTheme.content?.typo ?? {}),
color: scTheme.content?.color?.default,
padding: 1
padding: 1,
},
viewItemLabelActive: {
...((scTheme.content ?? {})['typo--medium'] ?? {}),
color: scTheme.content?.color?.selected,
padding: 1
padding: 1,
},
viewItemGroup: {
background: scTheme.background?.color?.default,
Expand Down Expand Up @@ -61,7 +60,7 @@ export const ToolbarStyles = createStyles((theme, {}, getRef) => {
borderWidth: '1px',
},
[`&+.${getRef('control')}`]: {
borderTopColor: `${scTheme.border?.color?.default} !important`
borderTopColor: `${scTheme.border?.color?.default} !important`,
},
},
navIcon: {
Expand Down
32 changes: 32 additions & 0 deletions packages/components/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,37 @@
# @bubbles-ui/components

## 1.2.96

### Patch Changes

- Versions bump
- Updated dependencies
- @bubbles-ui/icons@1.2.96

## 1.2.95

### Patch Changes

- Versions bump
- Updated dependencies
- @bubbles-ui/icons@1.2.95

## 1.2.94

### Patch Changes

- Versions bump
- Updated dependencies
- @bubbles-ui/icons@1.2.94

## 1.2.93

### Patch Changes

- Versions bump
- Updated dependencies
- @bubbles-ui/icons@1.2.93

## 1.2.92

### Patch Changes
Expand Down
4 changes: 2 additions & 2 deletions packages/components/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@bubbles-ui/components",
"version": "1.2.92",
"version": "1.2.96",
"description": "The Bubbles Design System is Leemonade's open-source design system for products and experiences.",
"main": "lib/index.js",
"module": "es/index.js",
Expand Down Expand Up @@ -61,7 +61,7 @@
"chromatic": "npx chromatic --project-token=7b10302a7b6b --build-script-name=build:storybook:raw"
},
"dependencies": {
"@bubbles-ui/icons": "^1.2.92",
"@bubbles-ui/icons": "^1.2.96",
"@emotion/react": "^11.10.0",
"@heroicons/react": "^1.0.5",
"@hookform/resolvers": "^3.3.2",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,6 @@ export const AVATARS_GROUP_PROP_TYPES = {
color: PropTypes.string,
initials: PropTypes.string,
fullName: PropTypes.string,
})
}),
),
};
14 changes: 9 additions & 5 deletions packages/components/src/misc/CardEmptyCover/CardEmptyCover.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,13 @@ import { AssetTaskIcon } from '../FileIcon/AssetTaskIcon';
import { AssetExpressTaskIcon } from '../FileIcon/AssetExpressTaskIcon';
import { AssetModuleIcon } from '../FileIcon/AssetModuleIcon';
import { AssetFeedbackIcon } from '../FileIcon/AssetFeedbackIcon';
import { AssetAudioIcon } from '../FileIcon/AssetAudioIcon'
import { AssetVideoIcon } from '../FileIcon/AssetVideoIcon'
import { AssetImageIcon } from '../FileIcon/AssetImageIcon'
import { AssetBookmarkIcon } from '../FileIcon/AssetBookmarkIcon'
import { AssetAudioIcon } from '../FileIcon/AssetAudioIcon';
import { AssetVideoIcon } from '../FileIcon/AssetVideoIcon';
import { AssetImageIcon } from '../FileIcon/AssetImageIcon';
import { AssetBookmarkIcon } from '../FileIcon/AssetBookmarkIcon';
import { AssetDocumentIconSmall } from '../FileIcon/AssetDocumentIcon';
import { AssetScormIcon } from '../FileIcon/AssetScormIcon';
import { AssetTestIcon } from '../FileIcon/AssetTestIcon';
import { Box } from '../../layout/Box';

const CardEmptyCover = memo(({ icon, fileType }) => {
Expand All @@ -29,6 +30,7 @@ const CardEmptyCover = memo(({ icon, fileType }) => {
{ key: 'feedback', value: <AssetFeedbackIcon height={18} width={18} color={'#878D96'} /> },
{ key: 'document', value: <AssetDocumentIconSmall height={18} width={18} color={'#878D96'} /> },
{ key: 'task', value: <AssetTaskIcon height={18} width={18} color={'#878D96'} /> },
{ key: 'tests', value: <AssetTestIcon height={18} width={18} color={'#878D96'} /> },
{
key: 'taskexpress',
value: <AssetExpressTaskIcon height={18} width={18} color={'#878D96'} />,
Expand All @@ -43,7 +45,9 @@ const CardEmptyCover = memo(({ icon, fileType }) => {
},
{
key: 'file',
value: <FileItemDisplay size={24} color={'#878D96'} iconStyle={{ backgroundColor: '#f8f9fb' }} />,
value: (
<FileItemDisplay size={24} color={'#878D96'} iconStyle={{ backgroundColor: '#f8f9fb' }} />
),
},
];

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
import PropTypes from 'prop-types';

export const ASSET_TEST_ICON_DEFAULT_PROPS = {
width: 24,
height: 24,
color: '#7E8795',
};
export const ASSET_TEST_ICON_PROP_TYPES = {
width: PropTypes.number,
height: PropTypes.number,
color: PropTypes.string,
};

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export * from './AssetTestIcon';
2 changes: 2 additions & 0 deletions packages/components/src/misc/FileIcon/FileIcon.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import { AssetImageIcon } from './AssetImageIcon';
import { AssetBookmarkIcon } from './AssetBookmarkIcon';
import { AssetDocumentIconSmall } from './AssetDocumentIcon';
import { AssetScormIcon } from './AssetScormIcon';
import { AssetTestIcon } from './AssetTestIcon';

export const FILE_ICON_DEFAULT_PROPS = {
size: 16,
Expand Down Expand Up @@ -39,6 +40,7 @@ const FileIcon = ({ fileType, fileExtension, label, size, color, iconStyle, ...p
{ key: 'curriculum', value: <PluginCurriculumIcon height={size} width={size} /> },
{ key: 'document', value: <AssetDocumentIconSmall height={18} width={18} /> },
{ key: 'scorm', value: <AssetScormIcon height={18} width={18} /> },
{ key: 'tests', value: <AssetTestIcon height={18} width={18} /> },
{
key: 'file',
value: (
Expand Down
2 changes: 1 addition & 1 deletion packages/components/src/navigation/Tabs/Tabs.js
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ const Wrapper = ({ usePageLayout, usePaddedLayout, fullWidth, className, childre
<Box
className={className}
sx={(theme) => ({
padding: usePaddedLayout && `0 ${theme.spacing[7]}px`,
padding: usePaddedLayout && `0 ${theme.other.global.spacing.padding.lg}`,
})}
>
{children}
Expand Down
36 changes: 36 additions & 0 deletions packages/editors/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,41 @@
# @bubbles-ui/editors

## 1.2.96

### Patch Changes

- Versions bump
- Updated dependencies
- @bubbles-ui/components@1.2.96
- @bubbles-ui/icons@1.2.96

## 1.2.95

### Patch Changes

- Versions bump
- Updated dependencies
- @bubbles-ui/components@1.2.95
- @bubbles-ui/icons@1.2.95

## 1.2.94

### Patch Changes

- Versions bump
- Updated dependencies
- @bubbles-ui/components@1.2.94
- @bubbles-ui/icons@1.2.94

## 1.2.93

### Patch Changes

- Versions bump
- Updated dependencies
- @bubbles-ui/components@1.2.93
- @bubbles-ui/icons@1.2.93

## 1.2.92

### Patch Changes
Expand Down
6 changes: 3 additions & 3 deletions packages/editors/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@bubbles-ui/editors",
"version": "1.2.92",
"version": "1.2.96",
"description": "The Bubbles Design System is Leemonade's open-source design system for products and experiences.",
"main": "lib/index.js",
"module": "es/index.js",
Expand Down Expand Up @@ -79,8 +79,8 @@
"styled-icons": "^10.45.0"
},
"peerDependencies": {
"@bubbles-ui/components": "^1.2.92",
"@bubbles-ui/icons": "^1.2.92",
"@bubbles-ui/components": "^1.2.96",
"@bubbles-ui/icons": "^1.2.96",
"react": "^17.0.1",
"react-dom": "^17.0.1",
"webpack": "*"
Expand Down
36 changes: 36 additions & 0 deletions packages/extras/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,41 @@
# @bubbles-ui/extras

## 1.2.96

### Patch Changes

- Versions bump
- Updated dependencies
- @bubbles-ui/components@1.2.96
- @bubbles-ui/icons@1.2.96

## 1.2.95

### Patch Changes

- Versions bump
- Updated dependencies
- @bubbles-ui/components@1.2.95
- @bubbles-ui/icons@1.2.95

## 1.2.94

### Patch Changes

- Versions bump
- Updated dependencies
- @bubbles-ui/components@1.2.94
- @bubbles-ui/icons@1.2.94

## 1.2.93

### Patch Changes

- Versions bump
- Updated dependencies
- @bubbles-ui/components@1.2.93
- @bubbles-ui/icons@1.2.93

## 1.2.92

### Patch Changes
Expand Down
6 changes: 3 additions & 3 deletions packages/extras/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@bubbles-ui/extras",
"version": "1.2.92",
"version": "1.2.96",
"description": "The Bubbles Design System is Leemonade's open-source design system for products and experiences.",
"main": "lib/index.js",
"module": "es/index.js",
Expand Down Expand Up @@ -53,8 +53,8 @@
"swiper": "^8.1.4"
},
"peerDependencies": {
"@bubbles-ui/components": "^1.2.92",
"@bubbles-ui/icons": "^1.2.92",
"@bubbles-ui/components": "^1.2.96",
"@bubbles-ui/icons": "^1.2.96",
"@mantine/core": "5.2.4",
"@mantine/hooks": "5.2.4",
"react": "^17.0.1",
Expand Down
Loading

0 comments on commit d43a622

Please sign in to comment.