From 7337b3fabb55be4d117d0d59dd028d4739817ef3 Mon Sep 17 00:00:00 2001 From: Chris Whitten Date: Sat, 2 May 2020 14:06:55 -0700 Subject: [PATCH 1/4] Truncate text of home tile, reduce width of left nav --- Composer/packages/client/src/pages/home/ItemContainer.tsx | 7 ++++++- Composer/packages/client/src/styles.ts | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/Composer/packages/client/src/pages/home/ItemContainer.tsx b/Composer/packages/client/src/pages/home/ItemContainer.tsx index 4abf6f8dae..12d64ee012 100644 --- a/Composer/packages/client/src/pages/home/ItemContainer.tsx +++ b/Composer/packages/client/src/pages/home/ItemContainer.tsx @@ -5,6 +5,7 @@ import { jsx, SerializedStyles } from '@emotion/core'; import React from 'react'; import { Button } from 'office-ui-fabric-react/lib/Button'; +import { Text } from 'office-ui-fabric-react/lib/Text'; import { itemContainerWrapper, @@ -44,7 +45,11 @@ export const ItemContainer: React.FC = ({
{title}
-
{content}
+
+ + {content} + +
); diff --git a/Composer/packages/client/src/styles.ts b/Composer/packages/client/src/styles.ts index ef089f7763..aad8adeab7 100644 --- a/Composer/packages/client/src/styles.ts +++ b/Composer/packages/client/src/styles.ts @@ -10,7 +10,7 @@ export const main = css` `; export const sideBar = isExpand => css` - width: ${isExpand ? '220' : '48'}px; + width: ${isExpand ? '175' : '48'}px; background-color: ${NeutralColors.gray20}; height: 100%; border-right: 1px solid ${NeutralColors.gray50}; From 1b5bfb81502764dcbcd16110b7f5c75d3844204b Mon Sep 17 00:00:00 2001 From: Chris Whitten Date: Sun, 3 May 2020 08:14:51 -0700 Subject: [PATCH 2/4] Avoid Show Code being cut off in electron --- Composer/packages/client/src/pages/design/index.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Composer/packages/client/src/pages/design/index.tsx b/Composer/packages/client/src/pages/design/index.tsx index 58ae43d367..0b1e602bbc 100644 --- a/Composer/packages/client/src/pages/design/index.tsx +++ b/Composer/packages/client/src/pages/design/index.tsx @@ -299,7 +299,7 @@ const DesignPage: React.FC +
Date: Sun, 3 May 2020 08:36:27 -0700 Subject: [PATCH 3/4] Fix breadcrumb --- Composer/packages/client/src/pages/design/index.tsx | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/Composer/packages/client/src/pages/design/index.tsx b/Composer/packages/client/src/pages/design/index.tsx index 0b1e602bbc..7a0d87dec7 100644 --- a/Composer/packages/client/src/pages/design/index.tsx +++ b/Composer/packages/client/src/pages/design/index.tsx @@ -60,12 +60,7 @@ function onRenderContent(subTitle, style) { } function onRenderBreadcrumbItem(item, render) { - return ( - - {!item.isRoot && } - {render(item)} - - ); + return {render(item)}; } function getAllRef(targetId, dialogs) { @@ -304,6 +299,8 @@ const DesignPage: React.FC undefined} data-testid="Breadcrumb" onRenderItem={onRenderBreadcrumbItem} /> From 029f299e534512f8fa08e00e697a1ebcdaad0ae5 Mon Sep 17 00:00:00 2001 From: Chris Whitten Date: Sun, 3 May 2020 08:51:35 -0700 Subject: [PATCH 4/4] Fix lint --- Composer/packages/client/src/pages/design/index.tsx | 1 - 1 file changed, 1 deletion(-) diff --git a/Composer/packages/client/src/pages/design/index.tsx b/Composer/packages/client/src/pages/design/index.tsx index 7a0d87dec7..f7b471ec4b 100644 --- a/Composer/packages/client/src/pages/design/index.tsx +++ b/Composer/packages/client/src/pages/design/index.tsx @@ -5,7 +5,6 @@ import { jsx } from '@emotion/core'; import React, { Suspense, useContext, useEffect, useMemo, useState, useRef } from 'react'; import { Breadcrumb, IBreadcrumbItem } from 'office-ui-fabric-react/lib/Breadcrumb'; -import { Icon } from 'office-ui-fabric-react/lib/Icon'; import formatMessage from 'format-message'; import { globalHistory, RouteComponentProps } from '@reach/router'; import get from 'lodash/get';