Merge branch 'main' into durnford/fix/response-editor

microsoft · May 16, 2021 · cedae6c · cedae6c
2 parents eb15035 + dc07be4
commit cedae6c
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/Composer/packages/client/src/pages/design/exportSkillModal/content/SelectItems.tsx b/Composer/packages/client/src/pages/design/exportSkillModal/content/SelectItems.tsx
@@ -23,7 +23,7 @@ import formatMessage from 'format-message';
 const styles = {
   detailListContainer: css`
     flex-grow: 1;
-    height: 350px;
+    height: 310px;
     position: relative;
     overflow: hidden;
   `,

diff --git a/Composer/packages/client/src/pages/design/exportSkillModal/index.tsx b/Composer/packages/client/src/pages/design/exportSkillModal/index.tsx
@@ -277,7 +277,7 @@ const ExportSkillModal: React.FC<ExportSkillModalProps> = ({ onSubmit, onDismiss
       onDismiss={handleDismiss}
     >
       <div css={styles.container}>
-        <p>
+        <p style={{ height: '38px' }}>
           {typeof subText === 'function' && subText()}
           {helpLink && (
             <React.Fragment>

diff --git a/Composer/packages/client/src/pages/design/exportSkillModal/styles.ts b/Composer/packages/client/src/pages/design/exportSkillModal/styles.ts
@@ -23,9 +23,12 @@ export const styles = {
       maxWidth: '80% !important',
       width: '960px !important',
     },
+    scrollableContent: {
+      overflow: 'hidden' as 'hidden',
+    },
   },
   container: css`
-    height: 520px;
+    height: 500px;
     display: flex;
     flex-direction: column;
     justify-content: space-between;