Merge branch 'release' into chore/ctl1

appsmithorg · Nov 13, 2024 · 98261ee · 98261ee
2 parents 251e726 + d90faa2
commit 98261ee
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 12 deletions.
diff --git a/.github/config.json b/.github/config.json
diff --git a/app/client/packages/design-system/ads/src/Button/Button.styles.tsx b/app/client/packages/design-system/ads/src/Button/Button.styles.tsx
@@ -29,6 +29,7 @@ const getSizes = (size: ButtonSizes, isIconButton?: boolean) => {
         ? "var(--ads-v2-spaces-2)"
         : "var(--ads-v2-spaces-2) var(--ads-v2-spaces-3)"};
       --button-gap: var(--ads-v2-spaces-2);
+      --button-min-width: 60px;
     `,
     md: css`
       --button-font-weight: 600;
@@ -37,6 +38,7 @@ const getSizes = (size: ButtonSizes, isIconButton?: boolean) => {
         ? "var(--ads-v2-spaces-3)"
         : "var(--ads-v2-spaces-3) var(--ads-v2-spaces-4)"};
       --button-gap: var(--ads-v2-spaces-3);
+      --button-min-width: 80px;
     `,
   };
 
@@ -175,6 +177,8 @@ export const ButtonContent = styled.div<{
   box-sizing: border-box;
   padding: var(--button-padding);
   border-radius: inherit;
+  min-width: ${({ isIconButton }) =>
+    isIconButton ? "unset" : "var(--button-min-width)"};
 
   & > .${ButtonContentChildrenClassName} {
     display: flex;

diff --git a/app/client/packages/design-system/ads/src/__assets__/icons/menu/js-function.svg b/app/client/packages/design-system/ads/src/__assets__/icons/menu/js-function.svg
diff --git a/app/client/src/assets/icons/menu/js-function.svg b/app/client/src/assets/icons/menu/js-function.svg
diff --git a/app/client/src/ce/pages/Applications/index.tsx b/app/client/src/ce/pages/Applications/index.tsx
@@ -318,6 +318,7 @@ export function LeftPaneSection(props: {
             <Button
               data-testid="t--workspace-new-workspace-auto-create"
               isDisabled={props.isFetchingWorkspaces}
+              isIconButton
               kind="tertiary"
               onClick={createNewWorkspace}
               startIcon="add-line"