Merge branch 'develop' of https://github.com/leemonade/bubbles into d…

…evelop
leemonade · Jan 17, 2024 · 786a1d4 · 786a1d4
2 parents 45bb386 + d2701f7
commit 786a1d4
Show file tree

Hide file tree

Showing 8 changed files with 46 additions and 40 deletions.
diff --git a/packages/components/src/layout/ContextContainer/ContextContainer.js b/packages/components/src/layout/ContextContainer/ContextContainer.js
@@ -33,6 +33,7 @@ export const CONTEXT_CONTAINER_PROP_TYPES = {
   style: PropTypes.object,
   subtitle: PropTypes.any,
   children: PropTypes.any,
+  titleRightZone: PropTypes.any,
 };
 
 const ContextContainer = ({
@@ -51,6 +52,7 @@ const ContextContainer = ({
   justifyContent,
   wrap,
   alignContent,
+  titleRightZone,
   ...props
 }) => {
   const { classes, cx } = ContextContainerStyles({ padded });
@@ -92,12 +94,15 @@ const ContextContainer = ({
       {(hasTitle || hasSubtitle || hasDescription) && (
         <Stack direction="column" spacing={2} noFlex fullWidth>
           {hasTitle && (
-            <Box>
-              {typeof title === 'string' ? (
-                <Title order={3} dangerouslySetInnerHTML={{ __html: title }} />
-              ) : (
-                subtitle
-              )}
+            <Box style={{ display: 'flex', justifyContent: 'space-between', alignItems: 'center' }}>
+              <Box>
+                {typeof title === 'string' ? (
+                  <Title order={3} dangerouslySetInnerHTML={{ __html: title }} />
+                ) : (
+                  subtitle
+                )}
+              </Box>
+              {titleRightZone ? <Box>{titleRightZone}</Box> : null}
             </Box>
           )}
           {hasSubtitle && (

diff --git 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/solid/esm/index.d.ts b/packages/icons/solid/esm/index.d.ts
@@ -82,6 +82,7 @@ export { default as FlagIcon } from './FlagIcon'
 export { default as GithubIcon } from './GithubIcon'
 export { default as GraduationHatIcon } from './GraduationHatIcon'
 export { default as HalfStarAlternateIcon } from './HalfStarAlternateIcon'
+export { default as InfoIcon } from './InfoIcon'
 export { default as InstagramIcon } from './InstagramIcon'
 export { default as JumpingPersonIcon } from './JumpingPersonIcon'
 export { default as KeyboardReturnIcon } from './KeyboardReturnIcon'
@@ -101,6 +102,7 @@ export { default as MicrophoneIcon } from './MicrophoneIcon'
 export { default as MoveToTopIcon } from './MoveToTopIcon'
 export { default as MusicNoteIcon } from './MusicNoteIcon'
 export { default as NavigationMenuIcon } from './NavigationMenuIcon'
+export { default as NoPauseIcon } from './NoPauseIcon'
 export { default as NonEvaluableIcon } from './NonEvaluableIcon'
 export { default as ParagraphSpacingIcon } from './ParagraphSpacingIcon'
 export { default as PassportIcon } from './PassportIcon'

diff --git a/packages/icons/solid/esm/index.js b/packages/icons/solid/esm/index.js
@@ -82,6 +82,7 @@ export { default as FlagIcon } from './FlagIcon.js'
 export { default as GithubIcon } from './GithubIcon.js'
 export { default as GraduationHatIcon } from './GraduationHatIcon.js'
 export { default as HalfStarAlternateIcon } from './HalfStarAlternateIcon.js'
+export { default as InfoIcon } from './InfoIcon.js'
 export { default as InstagramIcon } from './InstagramIcon.js'
 export { default as JumpingPersonIcon } from './JumpingPersonIcon.js'
 export { default as KeyboardReturnIcon } from './KeyboardReturnIcon.js'
@@ -101,6 +102,7 @@ export { default as MicrophoneIcon } from './MicrophoneIcon.js'
 export { default as MoveToTopIcon } from './MoveToTopIcon.js'
 export { default as MusicNoteIcon } from './MusicNoteIcon.js'
 export { default as NavigationMenuIcon } from './NavigationMenuIcon.js'
+export { default as NoPauseIcon } from './NoPauseIcon.js'
 export { default as NonEvaluableIcon } from './NonEvaluableIcon.js'
 export { default as ParagraphSpacingIcon } from './ParagraphSpacingIcon.js'
 export { default as PassportIcon } from './PassportIcon.js'

diff --git a/packages/icons/solid/index.d.ts b/packages/icons/solid/index.d.ts
@@ -82,6 +82,7 @@ export { default as FlagIcon } from './FlagIcon'
 export { default as GithubIcon } from './GithubIcon'
 export { default as GraduationHatIcon } from './GraduationHatIcon'
 export { default as HalfStarAlternateIcon } from './HalfStarAlternateIcon'
+export { default as InfoIcon } from './InfoIcon'
 export { default as InstagramIcon } from './InstagramIcon'
 export { default as JumpingPersonIcon } from './JumpingPersonIcon'
 export { default as KeyboardReturnIcon } from './KeyboardReturnIcon'
@@ -101,6 +102,7 @@ export { default as MicrophoneIcon } from './MicrophoneIcon'
 export { default as MoveToTopIcon } from './MoveToTopIcon'
 export { default as MusicNoteIcon } from './MusicNoteIcon'
 export { default as NavigationMenuIcon } from './NavigationMenuIcon'
+export { default as NoPauseIcon } from './NoPauseIcon'
 export { default as NonEvaluableIcon } from './NonEvaluableIcon'
 export { default as ParagraphSpacingIcon } from './ParagraphSpacingIcon'
 export { default as PassportIcon } from './PassportIcon'

diff --git a/packages/icons/solid/index.js b/packages/icons/solid/index.js
@@ -82,6 +82,7 @@ module.exports.FlagIcon = require("./FlagIcon.js")
 module.exports.GithubIcon = require("./GithubIcon.js")
 module.exports.GraduationHatIcon = require("./GraduationHatIcon.js")
 module.exports.HalfStarAlternateIcon = require("./HalfStarAlternateIcon.js")
+module.exports.InfoIcon = require("./InfoIcon.js")
 module.exports.InstagramIcon = require("./InstagramIcon.js")
 module.exports.JumpingPersonIcon = require("./JumpingPersonIcon.js")
 module.exports.KeyboardReturnIcon = require("./KeyboardReturnIcon.js")
@@ -101,6 +102,7 @@ module.exports.MicrophoneIcon = require("./MicrophoneIcon.js")
 module.exports.MoveToTopIcon = require("./MoveToTopIcon.js")
 module.exports.MusicNoteIcon = require("./MusicNoteIcon.js")
 module.exports.NavigationMenuIcon = require("./NavigationMenuIcon.js")
+module.exports.NoPauseIcon = require("./NoPauseIcon.js")
 module.exports.NonEvaluableIcon = require("./NonEvaluableIcon.js")
 module.exports.ParagraphSpacingIcon = require("./ParagraphSpacingIcon.js")
 module.exports.PassportIcon = require("./PassportIcon.js")

diff --git a/packages/icons/src/solid/info.svg b/packages/icons/src/solid/info.svg
diff --git a/packages/icons/src/solid/no-pause.svg b/packages/icons/src/solid/no-pause.svg