Skip to content

Commit fd4fb32

Browse files
authored
fix: component layout issues (#3629)
* reduce white space * remove borders * make code snippets more responsive * reduce tab size * add scrollbar
1 parent ca62b3d commit fd4fb32

File tree

4 files changed

+25
-23
lines changed

4 files changed

+25
-23
lines changed

src/app/views/layout/LayoutStyles.tsx

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ export const useLayoutStyles = makeStyles({
1515
},
1616
content: {
1717
display: 'flex',
18-
gap: tokens.spacingVerticalS
18+
overflowY: 'hidden'
1919
},
2020
sidebar: {
2121
flex: '0 0 auto',
@@ -27,16 +27,13 @@ export const useLayoutStyles = makeStyles({
2727
flex: '1 1 auto',
2828
display: 'flex',
2929
flexDirection: 'column',
30-
gap: tokens.spacingHorizontalS,
31-
overflowY: 'auto',
3230
minHeight: '300px',
3331
height: 'calc(100vh - 120px)'
3432
},
3533
requestResponseArea: {
3634
flex: '1',
3735
display: 'flex',
3836
flexDirection: 'column',
39-
gap: tokens.spacingHorizontalS,
4037
height: '100%',
4138
overflow: 'hidden'
4239
},
@@ -47,7 +44,7 @@ export const useLayoutStyles = makeStyles({
4744
maxHeight: '55%',
4845
overflow: 'hidden',
4946
borderRadius: tokens.borderRadiusMedium,
50-
padding: tokens.spacingHorizontalMNudge
47+
padding: tokens.spacingHorizontalS
5148
},
5249
requestArea: {
5350
flex: '1',
@@ -56,6 +53,6 @@ export const useLayoutStyles = makeStyles({
5653
maxHeight: '37%',
5754
overflow: 'hidden',
5855
borderRadius: tokens.borderRadiusMedium,
59-
padding: tokens.spacingHorizontalMNudge
56+
padding: tokens.spacingHorizontalS
6057
}
6158
});

src/app/views/query-response/pivot-items/pivot-item-v9.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ const useStyles = makeStyles({
5757
minHeight: 0,
5858
border: `1px solid ${tokens.colorNeutralStroke1}`,
5959
borderRadius: tokens.borderRadiusMedium,
60-
padding: tokens.spacingHorizontalM,
60+
padding: tokens.spacingHorizontalS,
6161
marginTop: tokens.spacingHorizontalS,
6262
backgroundColor: tokens.colorNeutralBackground1,
6363
overflow: 'hidden'
@@ -125,7 +125,7 @@ export const GetPivotItems = () => {
125125
<div className={styles.container}>
126126
{mobileScreen ? (
127127
<Overflow minimumVisible={1}>
128-
<TabList selectedValue={selectedValue} onTabSelect={onTabSelect}>
128+
<TabList selectedValue={selectedValue} onTabSelect={onTabSelect} size='small'>
129129
{tabs.map((tab) => (
130130
<OverflowItem key={tab.id} id={tab.id} priority={tab.id === selectedValue ? 2 : 1}>
131131
<Tab value={tab.id} icon={tab.icon}>
@@ -137,7 +137,7 @@ export const GetPivotItems = () => {
137137
</TabList>
138138
</Overflow>
139139
) : (
140-
<TabList selectedValue={selectedValue} onTabSelect={onTabSelect}>
140+
<TabList selectedValue={selectedValue} onTabSelect={onTabSelect} size='small'>
141141
{tabs.map((tab) => (
142142
<Tab key={tab.id} value={tab.id} icon={tab.icon}>
143143
{tab.name}

src/app/views/query-response/snippets/SnippetsV9.tsx

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import {
88
Tab,
99
TabList,
1010
TabValue,
11-
Text, tokens
11+
Text
1212
} from '@fluentui/react-components';
1313
import { useContext, useEffect, useState } from 'react';
1414
import { useAppDispatch, useAppSelector } from '../../../../store';
@@ -65,26 +65,31 @@ const supportedLanguages: LanguageSnippet = {
6565

6666
const useSnippetStyles = makeStyles({
6767
container: {
68-
margin: '0 auto'
68+
margin: '0 auto',
69+
maxHeight: '100vh',
70+
overflowY: 'auto',
71+
display: 'flex',
72+
flexDirection: 'column'
6973
},
7074
extraInformation: {
7175
color: 'rgb(0, 128, 0)',
72-
marginLeft: '28px',
73-
lineHeight: '1.5'
74-
},
75-
codeContainer: {
76-
border: `solid ${tokens.colorNeutralStroke1} ${tokens.strokeWidthThin}`,
77-
borderRadius: tokens.borderRadiusMedium,
78-
padding: tokens.spacingHorizontalMNudge,
79-
margin: tokens.spacingHorizontalMNudge
76+
marginLeft: '28px'
8077
},
8178
codeContainerLayout: {
8279
display: 'flex',
8380
flexDirection: 'column',
84-
height: '450px'
81+
flex: '1 1 auto',
82+
height: '30vh',
83+
overflowY: 'auto'
8584
},
8685
copyButton: {
8786
marginLeft: 'auto'
87+
},
88+
snippetContent: {
89+
display: 'flex',
90+
flexDirection: 'column',
91+
overflowY: 'auto',
92+
maxHeight: 'calc(100vh-120px)'
8893
}
8994
});
9095

@@ -230,7 +235,7 @@ const SnippetContent: React.FC<SnippetContentProps> = (
230235
const styles = useSnippetStyles();
231236

232237
return (
233-
<div className={styles.codeContainer}>
238+
<div className={styles.snippetContent}>
234239
{showSpinner && (
235240
<Spinner
236241
labelPosition='below'

src/app/views/query-runner/request/RequestV9.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ const Request = (props: IRequestProps) => {
130130
<div className={styles.tabContainer}>
131131
{mobileScreen ? (
132132
<Overflow minimumVisible={2}>
133-
<TabList selectedValue={selectedTab} onTabSelect={(_, data) => handleTabSelect(data.value)}>
133+
<TabList selectedValue={selectedTab} onTabSelect={(_, data) => handleTabSelect(data.value)} size='small'>
134134
{tabs.map((tab) => (
135135
<OverflowItem key={tab.id} id={tab.id} priority={tab.id === selectedTab ? 2 : 1}>
136136
<Tab value={tab.id} icon={tab.icon}>
@@ -142,7 +142,7 @@ const Request = (props: IRequestProps) => {
142142
</TabList>
143143
</Overflow>
144144
) : (
145-
<TabList selectedValue={selectedTab} onTabSelect={(_, data) => handleTabSelect(data.value)}>
145+
<TabList selectedValue={selectedTab} onTabSelect={(_, data) => handleTabSelect(data.value)} size='small'>
146146
{tabs.map((tab) => (
147147
<Tab key={tab.id} value={tab.id} icon={tab.icon}>
148148
{tab.name}

0 commit comments

Comments
 (0)