From d4fb7057db095ec0138498a2ea5aa1498859c077 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaime=20Go=CC=81mez=20Cimarro?= Date: Mon, 22 Jan 2024 10:09:19 +0100 Subject: [PATCH 1/3] feat: Added styles to textarea. --- .../BigCalendar/components/Event/EventCell.js | 22 +-- .../components/src/form/Textarea/Textarea.js | 6 +- .../components/src/informative/Badge/Badge.js | 12 +- .../src/informative/Badge/Badge.styles.js | 5 +- .../informative/ChatMessage/ChatMessage.js | 3 +- .../ChatMessage/ChatMessage.styles.js | 131 +++++++++--------- packages/components/src/tokens.compiled.js | 41 +----- packages/icons/outline/esm/index.d.ts | 2 - packages/icons/outline/esm/index.js | 2 - packages/icons/outline/index.d.ts | 2 - packages/icons/outline/index.js | 2 - packages/icons/solid/esm/index.d.ts | 2 + packages/icons/solid/esm/index.js | 2 + packages/icons/solid/index.d.ts | 2 + packages/icons/solid/index.js | 2 + .../icons/src/{outline => solid}/emogi.svg | 0 packages/icons/src/{outline => solid}/gif.svg | 0 17 files changed, 113 insertions(+), 123 deletions(-) rename packages/icons/src/{outline => solid}/emogi.svg (100%) rename packages/icons/src/{outline => solid}/gif.svg (100%) diff --git a/packages/calendars/src/BigCalendar/components/Event/EventCell.js b/packages/calendars/src/BigCalendar/components/Event/EventCell.js index 707c2b249..9c77395d2 100644 --- a/packages/calendars/src/BigCalendar/components/Event/EventCell.js +++ b/packages/calendars/src/BigCalendar/components/Event/EventCell.js @@ -12,7 +12,7 @@ const emptyPixel = function eventCellStylesRoot( colors, { - zIndex = -1, + zIndex = 0, desaturateColor = true, rotate = 0, isAllDay, @@ -25,7 +25,7 @@ function eventCellStylesRoot( leftArrow, printMode, }, - imp + imp, ) { const data = { position: 'relative', @@ -35,8 +35,8 @@ function eventCellStylesRoot( ? _.isArray(bgColor) ? bgColor[0] : desaturateColor - ? colord(bgColor).desaturate(0.2).alpha(0.2).toRgbString() - : bgColor + ? colord(bgColor).desaturate(0.2).alpha(0.2).toRgbString() + : bgColor : colors.uiBackground01 }${imp ? '!important' : ''}`, color: `${colors.text01}${imp ? '!important' : ''}`, @@ -132,10 +132,10 @@ const getArrowStyles = (rightArrow, leftArrow, bgColor, borderColor, printMode) ? '14px 0px 14px 4px' : '16px 0 16px 4px' : leftArrow - ? printMode - ? '14px 4px 14px 0px' - : '16px 4px 16px 0px' - : undefined, + ? printMode + ? '14px 4px 14px 0px' + : '16px 4px 16px 0px' + : undefined, borderColor: transparentBgColor ? 'transparent transparent transparent transparent' : `transparent ${leftArrow ? colord(bgColor).toRgbString() : 'transparent'} transparent ${ @@ -174,7 +174,7 @@ const eventCellStyles = createStyles( printMode, bgStartGradient, bgEndGradient, - } + }, ) => { const root = eventCellStylesRoot( theme.colors, @@ -192,7 +192,7 @@ const eventCellStyles = createStyles( leftArrow, printMode, }, - true + true, ); let item = {}; if (!isMonthView) { @@ -270,7 +270,7 @@ const eventCellStyles = createStyles( ...getArrowStyles(rightArrow, leftArrow, bgColor, borderColor, printMode), }, }; - } + }, ); export function sameDay(d1, d2) { diff --git a/packages/components/src/form/Textarea/Textarea.js b/packages/components/src/form/Textarea/Textarea.js index 09cb83ea2..de1643851 100644 --- a/packages/components/src/form/Textarea/Textarea.js +++ b/packages/components/src/form/Textarea/Textarea.js @@ -57,9 +57,10 @@ const Textarea = forwardRef( autoComplete, onKeyPress = () => {}, rightSection, + textareaStyles, ...props }, - ref + ref, ) => { const [labels, setLabels] = useState(counterLabels); const uuid = useId(); @@ -142,6 +143,7 @@ const Textarea = forwardRef( placeholder={placeholder} rightSection={rightSection} name={name} + style={textareaStyles} disabled={disabled} onBlur={onBlur} onChange={handleOnChange} @@ -160,7 +162,7 @@ const Textarea = forwardRef( )} ); - } + }, ); Textarea.defaultProps = TEXTAREA_DEFAULT_PROPS; diff --git a/packages/components/src/informative/Badge/Badge.js b/packages/components/src/informative/Badge/Badge.js index 7ce906bb6..c328a9548 100644 --- a/packages/components/src/informative/Badge/Badge.js +++ b/packages/components/src/informative/Badge/Badge.js @@ -53,6 +53,7 @@ const Badge = forwardRef( className, children, onClick, + disableHover, useAria, ...props }, @@ -66,7 +67,16 @@ const Badge = forwardRef( } const { classes, cx } = BadgeStyles( - { size, color, image, radius, severity, hasOnClick: isFunction(onClick), labelStyles }, + { + size, + color, + image, + radius, + disableHover, + severity, + hasOnClick: isFunction(onClick), + labelStyles, + }, { name: 'Badge' }, ); diff --git a/packages/components/src/informative/Badge/Badge.styles.js b/packages/components/src/informative/Badge/Badge.styles.js index 0374337d9..cf1600b0c 100644 --- a/packages/components/src/informative/Badge/Badge.styles.js +++ b/packages/components/src/informative/Badge/Badge.styles.js @@ -1,5 +1,5 @@ import { createStyles } from '@mantine/styles'; -import { pxToRem, getFontProductive } from '../../theme.mixins'; +import { getFontProductive, pxToRem } from '../../theme.mixins'; const getPadding = (size, isMedium, image, severity) => { const isMediumImage = !!image && isMedium; @@ -61,7 +61,7 @@ const getColor = (theme, color) => { }; export const BadgeStyles = createStyles( - (theme, { size, color, image, radius, severity, hasOnClick, labelStyles }) => { + (theme, { size, color, image, radius, severity, disableHover, hasOnClick, labelStyles }) => { const isLarge = size === 'lg'; const isSmall = size === 'xs'; const isMedium = size === 'md'; @@ -124,6 +124,7 @@ export const BadgeStyles = createStyles( paddingLeft: image && (isSmall ? pxToRem(29) : isMedium ? pxToRem(40) : null), height: 'auto', cursor: hasOnClick && 'pointer', + pointerEvents: disableHover ? 'none' : 'auto', ...getSeverity(), }, inner: { diff --git a/packages/components/src/informative/ChatMessage/ChatMessage.js b/packages/components/src/informative/ChatMessage/ChatMessage.js index 5031e118e..8d28c5231 100644 --- a/packages/components/src/informative/ChatMessage/ChatMessage.js +++ b/packages/components/src/informative/ChatMessage/ChatMessage.js @@ -13,6 +13,7 @@ const ChatMessage = ({ isOnline, locale, selected, + previoudMessageIsSameUser, highlight, showUser = true, showUserName = true, @@ -20,7 +21,7 @@ const ChatMessage = ({ isAdmin, }) => { const { classes } = ChatMessageStyles( - { isOwn, isTeacher, isAdmin, selected }, + { isOwn, isTeacher, isAdmin, selected, previoudMessageIsSameUser }, { name: 'ChatMessage' }, ); const fullName = getUserFullName(user); diff --git a/packages/components/src/informative/ChatMessage/ChatMessage.styles.js b/packages/components/src/informative/ChatMessage/ChatMessage.styles.js index 0f14570e6..24209ff14 100644 --- a/packages/components/src/informative/ChatMessage/ChatMessage.styles.js +++ b/packages/components/src/informative/ChatMessage/ChatMessage.styles.js @@ -1,67 +1,70 @@ import { createStyles } from '@mantine/styles'; -export const ChatMessageStyles = createStyles((theme, { isOwn, isTeacher, isAdmin, selected }) => { - const messageBox = {}; - if (isOwn) { - messageBox.borderRight = `2px solid #878D96`; - } else { - messageBox.borderLeft = `2px solid #878D96`; - } +export const ChatMessageStyles = createStyles( + (theme, { isOwn, previoudMessageIsSameUser, isTeacher, isAdmin, selected }) => { + const messageBox = {}; + if (isOwn) { + messageBox.borderRight = `2px solid #878D96`; + } else { + messageBox.borderLeft = `2px solid #878D96`; + } - return { - root: { - marginTop: theme.spacing[4], - padding: theme.spacing[2], - background: selected ? '#E4F4E6' : 'transparent', - display: 'flex', - justifyContent: isOwn ? 'end' : 'start', - alignItems: 'end', - gap: theme.spacing[1], - transition: 'background 0.3s ease', - }, - message: { - color: theme.other.global.content.color.text.default, - fontFamily: 'Albert Sans', - fontSize: 14, - fontStyle: 'normal', - fontWeight: 400, - lineHeight: '20px', - }, - messageBox: { - padding: theme.spacing[2], - paddingLeft: theme.spacing[3], - borderRadius: '2px', - backgroundColor: '#FFFFFF', - ...messageBox, - }, - messageBoxInner: { - display: 'flex', - alignItems: 'end', - gap: theme.spacing[2], - }, - messageDate: { - display: 'block', - textAlign: 'right', - color: theme.other.global.content.color.text.muted, - fontFamily: 'Albert Sans', - fontSize: 12, - fontStyle: 'normal', - fontWeight: 400, - lineHeight: '16px', - }, - name: { - overflow: 'hidden', - textOverflow: 'ellipsis', - whiteSpace: 'nowrap', - color: theme.other.global.content.color.text.muted, - fontFamily: 'Albert Sans', - fontSize: 12, - fontStyle: 'normal', - fontWeight: 400, - lineHeight: '16px', - }, - avatar: { - display: 'flex', - }, - }; -}); + return { + root: { + marginTop: previoudMessageIsSameUser ? theme.spacing[1] : theme.spacing[2], + padding: theme.spacing[2], + background: selected ? '#E4F4E6' : 'transparent', + display: 'flex', + justifyContent: isOwn ? 'end' : 'start', + alignItems: 'end', + gap: theme.spacing[1], + transition: 'background 0.3s ease', + borderRadius: '4px 2px 2px 4px', + }, + message: { + color: theme.other.global.content.color.text.default, + fontFamily: 'Albert Sans', + fontSize: 14, + fontStyle: 'normal', + fontWeight: 400, + lineHeight: '20px', + }, + messageBox: { + padding: theme.spacing[2], + paddingLeft: theme.spacing[3], + borderRadius: '2px', + backgroundColor: '#FFFFFF', + ...messageBox, + }, + messageBoxInner: { + display: 'flex', + alignItems: 'end', + gap: theme.spacing[2], + }, + messageDate: { + display: 'block', + textAlign: 'right', + color: theme.other.global.content.color.text.muted, + fontFamily: 'Albert Sans', + fontSize: 12, + fontStyle: 'normal', + fontWeight: 400, + lineHeight: '16px', + }, + name: { + overflow: 'hidden', + textOverflow: 'ellipsis', + whiteSpace: 'nowrap', + color: theme.other.global.content.color.text.muted, + fontFamily: 'Albert Sans', + fontSize: 12, + fontStyle: 'normal', + fontWeight: 400, + lineHeight: '16px', + }, + avatar: { + display: 'flex', + }, + }; + }, +); diff --git a/packages/components/src/tokens.compiled.js b/packages/components/src/tokens.compiled.js index c0c8660b3..ad11f90d1 100644 --- a/packages/components/src/tokens.compiled.js +++ b/packages/components/src/tokens.compiled.js @@ -1153,7 +1153,7 @@ export default { "y": 0, "blur": 4, "spread": 0, - "color": "#ffffff", + "color": "#ffffff26", "type": "dropShadow" }, "type": "boxShadow" @@ -1234,17 +1234,8 @@ export default { "type": "color" }, "hover--reverse-transparent": { - "value": "#ffffff", - "type": "color", - "$extensions": { - "studio.tokens": { - "modify": { - "type": "alpha", - "value": "0.15", - "space": "lch" - } - } - } + "value": "#ffffff26", + "type": "color" }, "down": { "value": "#F1FFBD", @@ -4939,30 +4930,12 @@ export default { "color": { "primary": { "default": { - "value": "#4D5358", - "type": "color", - "$extensions": { - "studio.tokens": { - "modify": { - "type": "alpha", - "value": "0.4", - "space": "lch" - } - } - } + "value": "#4d535866", + "type": "color" }, "hover": { - "value": "#4D5358", - "type": "color", - "$extensions": { - "studio.tokens": { - "modify": { - "type": "alpha", - "value": "0.7", - "space": "lch" - } - } - } + "value": "#4d5358b3", + "type": "color" }, "down": { "value": "#4D5358", diff --git a/packages/icons/outline/esm/index.d.ts b/packages/icons/outline/esm/index.d.ts index fcbb67298..b9005e619 100644 --- a/packages/icons/outline/esm/index.d.ts +++ b/packages/icons/outline/esm/index.d.ts @@ -56,7 +56,6 @@ export { default as EmailActionReplyIcon } from './EmailActionReplyIcon' export { default as EmailActionSendIcon } from './EmailActionSendIcon' export { default as EmailActionUnreadIcon } from './EmailActionUnreadIcon' export { default as EmailPileIcon } from './EmailPileIcon' -export { default as EmogiIcon } from './EmogiIcon' export { default as ExpandDiagonalIcon } from './ExpandDiagonalIcon' export { default as ExpandFullIcon } from './ExpandFullIcon' export { default as FamilyChildIcon } from './FamilyChildIcon' @@ -86,7 +85,6 @@ export { default as FormMediaAttachIcon } from './FormMediaAttachIcon' export { default as FormPictureFemaleAttachIcon } from './FormPictureFemaleAttachIcon' export { default as FormPictureMaleAttachIcon } from './FormPictureMaleAttachIcon' export { default as GaugeDashboardIcon } from './GaugeDashboardIcon' -export { default as GifIcon } from './GifIcon' export { default as HouseDoorIcon } from './HouseDoorIcon' export { default as HouseRoofIcon } from './HouseRoofIcon' export { default as HouseIcon } from './HouseIcon' diff --git a/packages/icons/outline/esm/index.js b/packages/icons/outline/esm/index.js index 5a89abb0a..a36e5ba9a 100644 --- a/packages/icons/outline/esm/index.js +++ b/packages/icons/outline/esm/index.js @@ -56,7 +56,6 @@ export { default as EmailActionReplyIcon } from './EmailActionReplyIcon.js' export { default as EmailActionSendIcon } from './EmailActionSendIcon.js' export { default as EmailActionUnreadIcon } from './EmailActionUnreadIcon.js' export { default as EmailPileIcon } from './EmailPileIcon.js' -export { default as EmogiIcon } from './EmogiIcon.js' export { default as ExpandDiagonalIcon } from './ExpandDiagonalIcon.js' export { default as ExpandFullIcon } from './ExpandFullIcon.js' export { default as FamilyChildIcon } from './FamilyChildIcon.js' @@ -86,7 +85,6 @@ export { default as FormMediaAttachIcon } from './FormMediaAttachIcon.js' export { default as FormPictureFemaleAttachIcon } from './FormPictureFemaleAttachIcon.js' export { default as FormPictureMaleAttachIcon } from './FormPictureMaleAttachIcon.js' export { default as GaugeDashboardIcon } from './GaugeDashboardIcon.js' -export { default as GifIcon } from './GifIcon.js' export { default as HouseDoorIcon } from './HouseDoorIcon.js' export { default as HouseRoofIcon } from './HouseRoofIcon.js' export { default as HouseIcon } from './HouseIcon.js' diff --git a/packages/icons/outline/index.d.ts b/packages/icons/outline/index.d.ts index fcbb67298..b9005e619 100644 --- a/packages/icons/outline/index.d.ts +++ b/packages/icons/outline/index.d.ts @@ -56,7 +56,6 @@ export { default as EmailActionReplyIcon } from './EmailActionReplyIcon' export { default as EmailActionSendIcon } from './EmailActionSendIcon' export { default as EmailActionUnreadIcon } from './EmailActionUnreadIcon' export { default as EmailPileIcon } from './EmailPileIcon' -export { default as EmogiIcon } from './EmogiIcon' export { default as ExpandDiagonalIcon } from './ExpandDiagonalIcon' export { default as ExpandFullIcon } from './ExpandFullIcon' export { default as FamilyChildIcon } from './FamilyChildIcon' @@ -86,7 +85,6 @@ export { default as FormMediaAttachIcon } from './FormMediaAttachIcon' export { default as FormPictureFemaleAttachIcon } from './FormPictureFemaleAttachIcon' export { default as FormPictureMaleAttachIcon } from './FormPictureMaleAttachIcon' export { default as GaugeDashboardIcon } from './GaugeDashboardIcon' -export { default as GifIcon } from './GifIcon' export { default as HouseDoorIcon } from './HouseDoorIcon' export { default as HouseRoofIcon } from './HouseRoofIcon' export { default as HouseIcon } from './HouseIcon' diff --git a/packages/icons/outline/index.js b/packages/icons/outline/index.js index 44838bd04..a5347c123 100644 --- a/packages/icons/outline/index.js +++ b/packages/icons/outline/index.js @@ -56,7 +56,6 @@ module.exports.EmailActionReplyIcon = require("./EmailActionReplyIcon.js") module.exports.EmailActionSendIcon = require("./EmailActionSendIcon.js") module.exports.EmailActionUnreadIcon = require("./EmailActionUnreadIcon.js") module.exports.EmailPileIcon = require("./EmailPileIcon.js") -module.exports.EmogiIcon = require("./EmogiIcon.js") module.exports.ExpandDiagonalIcon = require("./ExpandDiagonalIcon.js") module.exports.ExpandFullIcon = require("./ExpandFullIcon.js") module.exports.FamilyChildIcon = require("./FamilyChildIcon.js") @@ -86,7 +85,6 @@ module.exports.FormMediaAttachIcon = require("./FormMediaAttachIcon.js") module.exports.FormPictureFemaleAttachIcon = require("./FormPictureFemaleAttachIcon.js") module.exports.FormPictureMaleAttachIcon = require("./FormPictureMaleAttachIcon.js") module.exports.GaugeDashboardIcon = require("./GaugeDashboardIcon.js") -module.exports.GifIcon = require("./GifIcon.js") module.exports.HouseDoorIcon = require("./HouseDoorIcon.js") module.exports.HouseRoofIcon = require("./HouseRoofIcon.js") module.exports.HouseIcon = require("./HouseIcon.js") diff --git a/packages/icons/solid/esm/index.d.ts b/packages/icons/solid/esm/index.d.ts index d776778fb..4ea00e40a 100644 --- a/packages/icons/solid/esm/index.d.ts +++ b/packages/icons/solid/esm/index.d.ts @@ -74,6 +74,7 @@ export { default as EditorTextSize3Icon } from './EditorTextSize3Icon' export { default as EditorTextStrikeIcon } from './EditorTextStrikeIcon' export { default as EditorTextUnderlineIcon } from './EditorTextUnderlineIcon' export { default as ElectionDebateIcon } from './ElectionDebateIcon' +export { default as EmogiIcon } from './EmogiIcon' export { default as ExclamationIcon } from './ExclamationIcon' export { default as ExcludeIcon } from './ExcludeIcon' export { default as ExpandFullIcon } from './ExpandFullIcon' @@ -81,6 +82,7 @@ export { default as ExpandIcon } from './ExpandIcon' export { default as FacebookIcon } from './FacebookIcon' export { default as FavoriteHeartIcon } from './FavoriteHeartIcon' export { default as FlagIcon } from './FlagIcon' +export { default as GifIcon } from './GifIcon' export { default as GithubIcon } from './GithubIcon' export { default as GraduationHatIcon } from './GraduationHatIcon' export { default as HalfStarAlternateIcon } from './HalfStarAlternateIcon' diff --git a/packages/icons/solid/esm/index.js b/packages/icons/solid/esm/index.js index 1ac239198..327386152 100644 --- a/packages/icons/solid/esm/index.js +++ b/packages/icons/solid/esm/index.js @@ -74,6 +74,7 @@ export { default as EditorTextSize3Icon } from './EditorTextSize3Icon.js' export { default as EditorTextStrikeIcon } from './EditorTextStrikeIcon.js' export { default as EditorTextUnderlineIcon } from './EditorTextUnderlineIcon.js' export { default as ElectionDebateIcon } from './ElectionDebateIcon.js' +export { default as EmogiIcon } from './EmogiIcon.js' export { default as ExclamationIcon } from './ExclamationIcon.js' export { default as ExcludeIcon } from './ExcludeIcon.js' export { default as ExpandFullIcon } from './ExpandFullIcon.js' @@ -81,6 +82,7 @@ export { default as ExpandIcon } from './ExpandIcon.js' export { default as FacebookIcon } from './FacebookIcon.js' export { default as FavoriteHeartIcon } from './FavoriteHeartIcon.js' export { default as FlagIcon } from './FlagIcon.js' +export { default as GifIcon } from './GifIcon.js' export { default as GithubIcon } from './GithubIcon.js' export { default as GraduationHatIcon } from './GraduationHatIcon.js' export { default as HalfStarAlternateIcon } from './HalfStarAlternateIcon.js' diff --git a/packages/icons/solid/index.d.ts b/packages/icons/solid/index.d.ts index d776778fb..4ea00e40a 100644 --- a/packages/icons/solid/index.d.ts +++ b/packages/icons/solid/index.d.ts @@ -74,6 +74,7 @@ export { default as EditorTextSize3Icon } from './EditorTextSize3Icon' export { default as EditorTextStrikeIcon } from './EditorTextStrikeIcon' export { default as EditorTextUnderlineIcon } from './EditorTextUnderlineIcon' export { default as ElectionDebateIcon } from './ElectionDebateIcon' +export { default as EmogiIcon } from './EmogiIcon' export { default as ExclamationIcon } from './ExclamationIcon' export { default as ExcludeIcon } from './ExcludeIcon' export { default as ExpandFullIcon } from './ExpandFullIcon' @@ -81,6 +82,7 @@ export { default as ExpandIcon } from './ExpandIcon' export { default as FacebookIcon } from './FacebookIcon' export { default as FavoriteHeartIcon } from './FavoriteHeartIcon' export { default as FlagIcon } from './FlagIcon' +export { default as GifIcon } from './GifIcon' export { default as GithubIcon } from './GithubIcon' export { default as GraduationHatIcon } from './GraduationHatIcon' export { default as HalfStarAlternateIcon } from './HalfStarAlternateIcon' diff --git a/packages/icons/solid/index.js b/packages/icons/solid/index.js index b6233ff9a..0ef540442 100644 --- a/packages/icons/solid/index.js +++ b/packages/icons/solid/index.js @@ -74,6 +74,7 @@ module.exports.EditorTextSize3Icon = require("./EditorTextSize3Icon.js") module.exports.EditorTextStrikeIcon = require("./EditorTextStrikeIcon.js") module.exports.EditorTextUnderlineIcon = require("./EditorTextUnderlineIcon.js") module.exports.ElectionDebateIcon = require("./ElectionDebateIcon.js") +module.exports.EmogiIcon = require("./EmogiIcon.js") module.exports.ExclamationIcon = require("./ExclamationIcon.js") module.exports.ExcludeIcon = require("./ExcludeIcon.js") module.exports.ExpandFullIcon = require("./ExpandFullIcon.js") @@ -81,6 +82,7 @@ module.exports.ExpandIcon = require("./ExpandIcon.js") module.exports.FacebookIcon = require("./FacebookIcon.js") module.exports.FavoriteHeartIcon = require("./FavoriteHeartIcon.js") module.exports.FlagIcon = require("./FlagIcon.js") +module.exports.GifIcon = require("./GifIcon.js") module.exports.GithubIcon = require("./GithubIcon.js") module.exports.GraduationHatIcon = require("./GraduationHatIcon.js") module.exports.HalfStarAlternateIcon = require("./HalfStarAlternateIcon.js") diff --git a/packages/icons/src/outline/emogi.svg b/packages/icons/src/solid/emogi.svg similarity index 100% rename from packages/icons/src/outline/emogi.svg rename to packages/icons/src/solid/emogi.svg diff --git a/packages/icons/src/outline/gif.svg b/packages/icons/src/solid/gif.svg similarity index 100% rename from packages/icons/src/outline/gif.svg rename to packages/icons/src/solid/gif.svg From 7f8f201803c2921e0448f6dfada54b9a64f48c63 Mon Sep 17 00:00:00 2001 From: GitHub Actions Bot <> Date: Mon, 22 Jan 2024 09:20:55 +0000 Subject: [PATCH 2/3] chore: version bump --- packages/calendars/CHANGELOG.md | 9 +++++++++ packages/calendars/package.json | 6 +++--- packages/components/CHANGELOG.md | 8 ++++++++ packages/components/package.json | 4 ++-- packages/editors/CHANGELOG.md | 9 +++++++++ packages/editors/package.json | 6 +++--- packages/extras/CHANGELOG.md | 9 +++++++++ packages/extras/package.json | 6 +++--- packages/icons/CHANGELOG.md | 6 ++++++ packages/icons/package.json | 2 +- packages/leemons/CHANGELOG.md | 11 +++++++++++ packages/leemons/package.json | 10 +++++----- packages/notifications/CHANGELOG.md | 9 +++++++++ packages/notifications/package.json | 6 +++--- 14 files changed, 81 insertions(+), 20 deletions(-) diff --git a/packages/calendars/CHANGELOG.md b/packages/calendars/CHANGELOG.md index 63163cf05..1bb3a3008 100644 --- a/packages/calendars/CHANGELOG.md +++ b/packages/calendars/CHANGELOG.md @@ -1,5 +1,14 @@ # @bubbles-ui/calendars +## 1.2.136 + +### Patch Changes + +- Versions bump +- Updated dependencies + - @bubbles-ui/components@1.2.136 + - @bubbles-ui/icons@1.2.136 + ## 1.2.135 ### Patch Changes diff --git a/packages/calendars/package.json b/packages/calendars/package.json index 5419d4c98..d4e01ac70 100644 --- a/packages/calendars/package.json +++ b/packages/calendars/package.json @@ -1,6 +1,6 @@ { "name": "@bubbles-ui/calendars", - "version": "1.2.135", + "version": "1.2.136", "description": "The Bubbles Design System is Leemonade's open-source design system for products and experiences.", "main": "lib/index.js", "module": "es/index.js", @@ -59,8 +59,8 @@ "rrule": "^2.6.8" }, "peerDependencies": { - "@bubbles-ui/components": "^1.2.135", - "@bubbles-ui/icons": "^1.2.135", + "@bubbles-ui/components": "^1.2.136", + "@bubbles-ui/icons": "^1.2.136", "react": "^17.0.1", "react-dom": "^17.0.1", "webpack": "*" diff --git a/packages/components/CHANGELOG.md b/packages/components/CHANGELOG.md index 3f74ef5e4..c1a554d16 100644 --- a/packages/components/CHANGELOG.md +++ b/packages/components/CHANGELOG.md @@ -1,5 +1,13 @@ # @bubbles-ui/components +## 1.2.136 + +### Patch Changes + +- Versions bump +- Updated dependencies + - @bubbles-ui/icons@1.2.136 + ## 1.2.135 ### Patch Changes diff --git a/packages/components/package.json b/packages/components/package.json index 2c8309b68..0dc64e121 100644 --- a/packages/components/package.json +++ b/packages/components/package.json @@ -1,6 +1,6 @@ { "name": "@bubbles-ui/components", - "version": "1.2.135", + "version": "1.2.136", "description": "The Bubbles Design System is Leemonade's open-source design system for products and experiences.", "main": "lib/index.js", "module": "es/index.js", @@ -61,7 +61,7 @@ "chromatic": "npx chromatic --project-token=7b10302a7b6b --build-script-name=build:storybook:raw" }, "dependencies": { - "@bubbles-ui/icons": "^1.2.135", + "@bubbles-ui/icons": "^1.2.136", "@emotion/react": "^11.10.0", "@heroicons/react": "^1.0.5", "@hookform/resolvers": "^3.3.2", diff --git a/packages/editors/CHANGELOG.md b/packages/editors/CHANGELOG.md index 77fb36221..eb5029e66 100644 --- a/packages/editors/CHANGELOG.md +++ b/packages/editors/CHANGELOG.md @@ -1,5 +1,14 @@ # @bubbles-ui/editors +## 1.2.136 + +### Patch Changes + +- Versions bump +- Updated dependencies + - @bubbles-ui/components@1.2.136 + - @bubbles-ui/icons@1.2.136 + ## 1.2.135 ### Patch Changes diff --git a/packages/editors/package.json b/packages/editors/package.json index 17b00a287..ced0ada7f 100644 --- a/packages/editors/package.json +++ b/packages/editors/package.json @@ -1,6 +1,6 @@ { "name": "@bubbles-ui/editors", - "version": "1.2.135", + "version": "1.2.136", "description": "The Bubbles Design System is Leemonade's open-source design system for products and experiences.", "main": "lib/index.js", "module": "es/index.js", @@ -79,8 +79,8 @@ "styled-icons": "^10.45.0" }, "peerDependencies": { - "@bubbles-ui/components": "^1.2.135", - "@bubbles-ui/icons": "^1.2.135", + "@bubbles-ui/components": "^1.2.136", + "@bubbles-ui/icons": "^1.2.136", "react": "^17.0.1", "react-dom": "^17.0.1", "webpack": "*" diff --git a/packages/extras/CHANGELOG.md b/packages/extras/CHANGELOG.md index 4c7765baa..b5b60d29a 100644 --- a/packages/extras/CHANGELOG.md +++ b/packages/extras/CHANGELOG.md @@ -1,5 +1,14 @@ # @bubbles-ui/extras +## 1.2.136 + +### Patch Changes + +- Versions bump +- Updated dependencies + - @bubbles-ui/components@1.2.136 + - @bubbles-ui/icons@1.2.136 + ## 1.2.135 ### Patch Changes diff --git a/packages/extras/package.json b/packages/extras/package.json index 45152cb69..e685306ed 100644 --- a/packages/extras/package.json +++ b/packages/extras/package.json @@ -1,6 +1,6 @@ { "name": "@bubbles-ui/extras", - "version": "1.2.135", + "version": "1.2.136", "description": "The Bubbles Design System is Leemonade's open-source design system for products and experiences.", "main": "lib/index.js", "module": "es/index.js", @@ -53,8 +53,8 @@ "swiper": "^8.1.4" }, "peerDependencies": { - "@bubbles-ui/components": "^1.2.135", - "@bubbles-ui/icons": "^1.2.135", + "@bubbles-ui/components": "^1.2.136", + "@bubbles-ui/icons": "^1.2.136", "@mantine/core": "5.2.4", "@mantine/hooks": "5.2.4", "react": "^17.0.1", diff --git a/packages/icons/CHANGELOG.md b/packages/icons/CHANGELOG.md index 65f7afd8e..67de1d5e1 100644 --- a/packages/icons/CHANGELOG.md +++ b/packages/icons/CHANGELOG.md @@ -1,5 +1,11 @@ # @bubbles-ui/icons +## 1.2.136 + +### Patch Changes + +- Versions bump + ## 1.2.135 ### Patch Changes diff --git a/packages/icons/package.json b/packages/icons/package.json index fd8d4fccc..bd8f2f427 100644 --- a/packages/icons/package.json +++ b/packages/icons/package.json @@ -1,6 +1,6 @@ { "name": "@bubbles-ui/icons", - "version": "1.2.135", + "version": "1.2.136", "description": "The Bubbles Design System icons library.", "license": "MIT", "repository": { diff --git a/packages/leemons/CHANGELOG.md b/packages/leemons/CHANGELOG.md index f4f832caf..768f5be6a 100644 --- a/packages/leemons/CHANGELOG.md +++ b/packages/leemons/CHANGELOG.md @@ -1,5 +1,16 @@ # @bubbles-ui/leemons +## 1.2.136 + +### Patch Changes + +- Versions bump +- Updated dependencies + - @bubbles-ui/components@1.2.136 + - @bubbles-ui/calendars@1.2.136 + - @bubbles-ui/editors@1.2.136 + - @bubbles-ui/icons@1.2.136 + ## 1.2.135 ### Patch Changes diff --git a/packages/leemons/package.json b/packages/leemons/package.json index 605d4c2d9..1769ca39e 100644 --- a/packages/leemons/package.json +++ b/packages/leemons/package.json @@ -1,6 +1,6 @@ { "name": "@bubbles-ui/leemons", - "version": "1.2.135", + "version": "1.2.136", "description": "The Bubbles Design System is Leemonade's open-source design system for products and experiences.", "main": "lib/index.js", "module": "es/index.js", @@ -72,10 +72,10 @@ "ajv": "6.12.6" }, "peerDependencies": { - "@bubbles-ui/calendars": "^1.2.135", - "@bubbles-ui/components": "^1.2.135", - "@bubbles-ui/editors": "^1.2.135", - "@bubbles-ui/icons": "^1.2.135", + "@bubbles-ui/calendars": "^1.2.136", + "@bubbles-ui/components": "^1.2.136", + "@bubbles-ui/editors": "^1.2.136", + "@bubbles-ui/icons": "^1.2.136", "dayjs": "^1.10.7", "react": "^17.0.1", "react-dom": "^17.0.1", diff --git a/packages/notifications/CHANGELOG.md b/packages/notifications/CHANGELOG.md index 9d53dc4cb..37cb508a3 100644 --- a/packages/notifications/CHANGELOG.md +++ b/packages/notifications/CHANGELOG.md @@ -1,5 +1,14 @@ # @bubbles-ui/notifications +## 1.2.136 + +### Patch Changes + +- Versions bump +- Updated dependencies + - @bubbles-ui/components@1.2.136 + - @bubbles-ui/icons@1.2.136 + ## 1.2.135 ### Patch Changes diff --git a/packages/notifications/package.json b/packages/notifications/package.json index e7b148a9e..3510264bc 100644 --- a/packages/notifications/package.json +++ b/packages/notifications/package.json @@ -1,6 +1,6 @@ { "name": "@bubbles-ui/notifications", - "version": "1.2.135", + "version": "1.2.136", "description": "The Bubbles Design System is Leemonade's open-source design system for products and experiences.", "main": "lib/index.js", "module": "es/index.js", @@ -52,8 +52,8 @@ "react-transition-group": "^4.4.2" }, "peerDependencies": { - "@bubbles-ui/components": "^1.2.135", - "@bubbles-ui/icons": "^1.2.135", + "@bubbles-ui/components": "^1.2.136", + "@bubbles-ui/icons": "^1.2.136", "@mantine/core": "5.2.4", "@mantine/hooks": "5.2.4", "react": "^17.0.1", From fc07539148baafe07c712dc20cae4ab110a2fd8c Mon Sep 17 00:00:00 2001 From: Banshee-92 <138103229+Banshee-92@users.noreply.github.com> Date: Mon, 22 Jan 2024 10:21:07 +0100 Subject: [PATCH 3/3] Change file upload --- tokens.json | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/tokens.json b/tokens.json index 7244b4dae..1d266828f 100644 --- a/tokens.json +++ b/tokens.json @@ -2013,6 +2013,14 @@ "width": { "value": "{global.border.width.sm}", "type": "borderWidth" + }, + "style": { + "value": { + "style": "dashed", + "width": "2px", + "color": "{dropzone.border.color.default}" + }, + "type": "border" } } }, @@ -6305,8 +6313,8 @@ "value": { "fontFamily": "{core.font.family.main}", "fontWeight": "{core.font.weight.medium}", - "lineHeight": "{core.font.lineHeight.600}px", - "fontSize": "48 px" + "lineHeight": "{core.font.lineHeight.500}px", + "fontSize": "40 px" }, "type": "typography" },