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
paola-p committed Dec 19, 2023
2 parents 111e2a8 + f27902b commit 11c3742
Show file tree
Hide file tree
Showing 24 changed files with 290 additions and 238 deletions.
108 changes: 0 additions & 108 deletions .idea/sonarlint/issuestore/index.pb

This file was deleted.

108 changes: 0 additions & 108 deletions .idea/sonarlint/securityhotspotstore/index.pb

This file was deleted.

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.69

### Patch Changes

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

## 1.2.68

### Patch Changes

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

## 1.2.67

### Patch Changes

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

## 1.2.66

### Patch Changes

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

## 1.2.65

### 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.65",
"version": "1.2.69",
"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.65",
"@bubbles-ui/icons": "^1.2.65",
"@bubbles-ui/components": "^1.2.69",
"@bubbles-ui/icons": "^1.2.69",
"react": "^17.0.1",
"react-dom": "^17.0.1",
"webpack": "*"
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.69

### Patch Changes

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

## 1.2.68

### Patch Changes

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

## 1.2.67

### Patch Changes

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

## 1.2.66

### Patch Changes

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

## 1.2.65

### 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.65",
"version": "1.2.69",
"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.65",
"@bubbles-ui/icons": "^1.2.69",
"@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
@@ -1,5 +1,6 @@
import React from 'react';
import PropTypes from 'prop-types';
import { isFunction } from 'lodash';
import { Box } from '../../Box';
import { Stack } from '../../Stack';
import { TotalLayoutContainerStyles } from './TotalLayoutContainer.styles';
Expand Down Expand Up @@ -35,12 +36,12 @@ const TotalLayoutContainer = ({ Header, Footer, scrollRef, children }) => {
<Box id="TotalLayout" className={classes.root}>
<Stack fullWidth fullHeight direction="column">
<Box className={classes.header} noFlex>
<Header style={{ position: 'fixed', top: 0, height: '72px' }} />
{isFunction(Header) ? <Header /> : Header}
</Box>
{children}
{!!Footer && (
<Box className={classes.footerContainer} noFlex>
{Footer}
{isFunction(Footer) ? <Footer /> : Footer}
</Box>
)}
</Stack>
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.69

### Patch Changes

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

## 1.2.68

### Patch Changes

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

## 1.2.67

### Patch Changes

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

## 1.2.66

### Patch Changes

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

## 1.2.65

### Patch Changes
Expand Down
Loading

0 comments on commit 11c3742

Please sign in to comment.