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
johan-fx committed Dec 21, 2023
2 parents 92290bb + fb061c8 commit ad4f1e0
Show file tree
Hide file tree
Showing 20 changed files with 194 additions and 20 deletions.
18 changes: 18 additions & 0 deletions packages/calendars/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,23 @@
# @bubbles-ui/calendars

## 1.2.80

### Patch Changes

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

## 1.2.79

### Patch Changes

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

## 1.2.78

### 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.78",
"version": "1.2.80",
"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.78",
"@bubbles-ui/icons": "^1.2.78",
"@bubbles-ui/components": "^1.2.80",
"@bubbles-ui/icons": "^1.2.80",
"react": "^17.0.1",
"react-dom": "^17.0.1",
"webpack": "*"
Expand Down
16 changes: 16 additions & 0 deletions packages/components/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,21 @@
# @bubbles-ui/components

## 1.2.80

### Patch Changes

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

## 1.2.79

### Patch Changes

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

## 1.2.78

### 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.78",
"version": "1.2.80",
"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.78",
"@bubbles-ui/icons": "^1.2.80",
"@emotion/react": "^11.10.0",
"@heroicons/react": "^1.0.5",
"@hookform/resolvers": "^3.3.2",
Expand Down
5 changes: 5 additions & 0 deletions packages/components/src/misc/CardEmptyCover/CardEmptyCover.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import { AssetModuleIcon } from '../FileIcon/AssetModuleIcon';
import { AssetFeedbackIcon } from '../FileIcon/AssetFeedbackIcon';
import { FileItemDisplay } from '../../informative/FileItemDisplay';
import { AssetDocumentIconSmall } from '../FileIcon/AssetDocumentIcon';
import { AssetScormIcon } from '../FileIcon/AssetScormIcon';

const CardEmptyCover = memo(({ icon, fileType }) => {
const pairColumnRef = useRef(null);
Expand All @@ -38,6 +39,10 @@ const CardEmptyCover = memo(({ icon, fileType }) => {
key: 'learningpaths.module',
value: <AssetModuleIcon height={24} width={24} color={'#878D96'} />,
},
{
key: 'scorm',
value: <AssetScormIcon height={24} width={24} color={'#878D96'} />,
},
{
key: 'file',
value: <FileItemDisplay size={18} color={'#878D96'} />,
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
import PropTypes from 'prop-types';

export const ASSET_SCORM_ICON_DEFAULT_PROPS = {
width: 24,
height: 24,
color: '#7E8795',
};
export const ASSET_SCORM_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 './AssetScormIcon';
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 @@ -10,6 +10,7 @@ import { AssetAudioIcon } from './AssetAudioIcon';
import { AssetImageIcon } from './AssetImageIcon';
import { AssetBookmarkIcon } from './AssetBookmarkIcon';
import { AssetDocumentIconSmall } from './AssetDocumentIcon';
import { AssetScormIcon } from './AssetScormIcon';

export const FILE_ICON_DEFAULT_PROPS = {
size: 16,
Expand Down Expand Up @@ -37,6 +38,7 @@ const FileIcon = ({ fileType, fileExtension, label, size, color, iconStyle, ...p
{ key: 'path', value: <AssetPathIcon height={size} width={size} /> },
{ 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: 'file',
value: (
Expand Down
1 change: 1 addition & 0 deletions packages/components/src/misc/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,6 @@ export * from './FileIcon/AssetBookmarkIcon';
export * from './FileIcon/AssetVideoIcon';
export * from './FileIcon/AssetMediaIcon';
export * from './FileIcon/AssetDocumentIcon';
export * from './FileIcon/AssetScormIcon';
export * from './AvatarSubject';
export * from './CardEmptyCover';
18 changes: 18 additions & 0 deletions packages/editors/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,23 @@
# @bubbles-ui/editors

## 1.2.80

### Patch Changes

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

## 1.2.79

### Patch Changes

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

## 1.2.78

### 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.78",
"version": "1.2.80",
"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.78",
"@bubbles-ui/icons": "^1.2.78",
"@bubbles-ui/components": "^1.2.80",
"@bubbles-ui/icons": "^1.2.80",
"react": "^17.0.1",
"react-dom": "^17.0.1",
"webpack": "*"
Expand Down
18 changes: 18 additions & 0 deletions packages/extras/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,23 @@
# @bubbles-ui/extras

## 1.2.80

### Patch Changes

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

## 1.2.79

### Patch Changes

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

## 1.2.78

### 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.78",
"version": "1.2.80",
"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.78",
"@bubbles-ui/icons": "^1.2.78",
"@bubbles-ui/components": "^1.2.80",
"@bubbles-ui/icons": "^1.2.80",
"@mantine/core": "5.2.4",
"@mantine/hooks": "5.2.4",
"react": "^17.0.1",
Expand Down
12 changes: 12 additions & 0 deletions packages/icons/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,17 @@
# @bubbles-ui/icons

## 1.2.80

### Patch Changes

- Versions bump

## 1.2.79

### Patch Changes

- Versions bump

## 1.2.78

### Patch Changes
Expand Down
2 changes: 1 addition & 1 deletion packages/icons/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@bubbles-ui/icons",
"version": "1.2.78",
"version": "1.2.80",
"description": "The Bubbles Design System icons library.",
"license": "MIT",
"repository": {
Expand Down
22 changes: 22 additions & 0 deletions packages/leemons/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,27 @@
# @bubbles-ui/leemons

## 1.2.80

### Patch Changes

- Versions bump
- Updated dependencies
- @bubbles-ui/components@1.2.80
- @bubbles-ui/calendars@1.2.80
- @bubbles-ui/editors@1.2.80
- @bubbles-ui/icons@1.2.80

## 1.2.79

### Patch Changes

- Versions bump
- Updated dependencies
- @bubbles-ui/components@1.2.79
- @bubbles-ui/calendars@1.2.79
- @bubbles-ui/editors@1.2.79
- @bubbles-ui/icons@1.2.79

## 1.2.78

### Patch Changes
Expand Down
10 changes: 5 additions & 5 deletions packages/leemons/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@bubbles-ui/leemons",
"version": "1.2.78",
"version": "1.2.80",
"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 @@ -74,10 +74,10 @@
"ajv": "6.12.6"
},
"peerDependencies": {
"@bubbles-ui/calendars": "^1.2.78",
"@bubbles-ui/components": "^1.2.78",
"@bubbles-ui/editors": "^1.2.78",
"@bubbles-ui/icons": "^1.2.78",
"@bubbles-ui/calendars": "^1.2.80",
"@bubbles-ui/components": "^1.2.80",
"@bubbles-ui/editors": "^1.2.80",
"@bubbles-ui/icons": "^1.2.80",
"dayjs": "^1.10.7",
"react": "^17.0.1",
"react-dom": "^17.0.1",
Expand Down
18 changes: 18 additions & 0 deletions packages/notifications/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,23 @@
# @bubbles-ui/notifications

## 1.2.80

### Patch Changes

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

## 1.2.79

### Patch Changes

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

## 1.2.78

### Patch Changes
Expand Down
6 changes: 3 additions & 3 deletions packages/notifications/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@bubbles-ui/notifications",
"version": "1.2.78",
"version": "1.2.80",
"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 @@ -52,8 +52,8 @@
"react-transition-group": "^4.4.2"
},
"peerDependencies": {
"@bubbles-ui/components": "^1.2.78",
"@bubbles-ui/icons": "^1.2.78",
"@bubbles-ui/components": "^1.2.80",
"@bubbles-ui/icons": "^1.2.80",
"@mantine/core": "5.2.4",
"@mantine/hooks": "5.2.4",
"react": "^17.0.1",
Expand Down

0 comments on commit ad4f1e0

Please sign in to comment.