Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix: Add Fluent Responsive stylesheet #1500

Merged
merged 16 commits into from
Mar 8, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
"mini-css-extract-plugin": "1.6.2",
"monaco-editor": "0.25.2",
"monaco-editor-webpack-plugin": "4.2.0",
"office-ui-fabric-core": "11.0.0",
"postcss-flexbugs-fixes": "5.0.2",
"postcss-loader": "4.3.0",
"postcss-preset-env": "7.3.0",
Expand Down Expand Up @@ -123,4 +124,4 @@
"reportFile": "test-report.xml",
"indent": 4
}
}
}
10 changes: 5 additions & 5 deletions src/app/services/reducers/dimensions-reducers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,19 @@ import { RESIZE_SUCCESS } from '../redux-constants';
const initialState: IDimensions = {
request: {
width: '100%',
height: '36vh'
height: '40%'
},
response: {
width: '100%',
height: '62vh'
height: '60%'
},
sidebar: {
width: '26%',
height: '98vh'
height: ''
},
content: {
width: '72%',
height: '98vh'
width: '74%',
height: ''
}
};

Expand Down
18 changes: 14 additions & 4 deletions src/app/views/App.styles.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,24 @@ export const appStyles = (theme: ITheme) => {
background: theme.semanticColors.bodyBackground,
color: theme.semanticColors.bodyText,
paddingTop: theme.spacing.s1,
width: '100%'
width: '100%',
height: '100%',
paddingRight: '15px',
paddingLeft: '4px',
marginLeft: 'auto',
marginRight: 'auto'
},
appRow: {
display: 'flex',
flexWrap: 'no-wrap'
},
tryItMessage: {
marginBottom: theme.spacing.s1
},
sidebar: {
background: theme.palette.neutralLighter,
paddingLeft: 10
paddingRight: 10,
marginRight: 10
},
sidebarMini: {
background: theme.palette.neutralLighter,
Expand Down Expand Up @@ -73,8 +83,8 @@ export const appStyles = (theme: ITheme) => {
},
feedbackButtonMobileDisplay: {
position: 'absolute',
top: '-1px',
right: '15px'
top: '13px',
right: '10px'
}
};
};
40 changes: 22 additions & 18 deletions src/app/views/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -377,6 +377,7 @@ class App extends Component<IAppProps, IAppState> {
let sideHeight = sidebar.height;
let maxWidth = '50%';
let contentWidth = content.width;
const contentHeight = content.height;

const query = createShareLink(sampleQuery, authenticated);
const { mobileScreen, showSidebar } = sidebarProperties;
Expand All @@ -392,9 +393,9 @@ class App extends Component<IAppProps, IAppState> {
};

if (mobileScreen) {
layout = sidebarWidth = 'col-xs-12 col-sm-12';
layout = sidebarWidth = 'ms-Grid-col ms-sm12';
sideWidth = '100%';
sideHeight = '150px';
sideHeight = '100%';
maxWidth = '100%';
contentWidth = '100%';
layout += ' layout';
Expand All @@ -407,24 +408,27 @@ class App extends Component<IAppProps, IAppState> {
return (
// @ts-ignore
<ThemeContext.Provider value={this.props.appTheme}>
<div className={`container-fluid ${classes.app}`}>
<div className={`ms-Grid ${classes.app}`} style={{ paddingLeft : mobileScreen && '15px'}}>
<Announced
message={
!showSidebar
? translateMessage('Sidebar minimized')
: translateMessage('Sidebar maximized')
}
/>
<div className='row'>
<div className={ `ms-Grid-row ${classes.appRow}`} style={{
flexWrap: mobileScreen && 'wrap',
marginRight: showSidebar && '-20px' }}>

{graphExplorerMode === Mode.Complete && (
<Resizable
onResize={(e: any, direction: any, ref: any) => {
if (ref?.style?.width) {
this.resizeSideBar(ref.style.width);
}
}}
className={sidebarWidth}
minWidth={'4vw'}
className={`ms-Grid-col ms-sm12 ms-md4 ms-lg4 ${sidebarWidth}`}
minWidth={'4'}
maxWidth={maxWidth}
enable={{
right: true
Expand Down Expand Up @@ -465,29 +469,29 @@ class App extends Component<IAppProps, IAppState> {
{displayContent && (
<Resizable
bounds={'window'}
className={layout}
style={{
marginLeft: 10
}}
className={`ms-Grid-col ms-sm12 ms-md4 ms-lg4 ${layout}`}
enable={{
right: false
}}
size={{
width: graphExplorerMode === Mode.TryIt ? '100%' : contentWidth,
height: '98vh'
height: contentHeight
}}
style={!sidebarProperties.showSidebar && !mobileScreen ? {marginLeft: '8px'} : {}}
>
<div style={{ marginBottom: 8 }}>
<QueryRunner onSelectVerb={this.handleSelectVerb} />
<div style={mobileScreen ? this.statusAreaMobileStyle : this.statusAreaLaptopStyle}>
<TermsOfUseMessage />
</div>
</div>
<div style={mobileScreen ? this.statusAreaMobileStyle : this.statusAreaLaptopStyle}>
<TermsOfUseMessage />
<StatusMessages />
</div>
{
// @ts-ignore

<div>
<div style={mobileScreen ? this.statusAreaMobileStyle : this.statusAreaLaptopStyle}>
<StatusMessages />
</div>
<QueryResponse verb={this.state.selectedVerb} />
}
</div>
</Resizable>
)}
</div>
Expand Down
8 changes: 4 additions & 4 deletions src/app/views/query-runner/QueryRunner.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -134,8 +134,8 @@ IQueryRunnerState
public render() {
return (
<>
<div className='row'>
<div className='col-sm-12 col-lg-12'>
<div className='ms-Grid-row'>
<div className='ms-Grid-col ms-sm-12 ms-lg-12'>
{
// @ts-ignore
<QueryInput
Expand All @@ -147,8 +147,8 @@ IQueryRunnerState
}
</div>
</div>
<div className='row' style={{ marginTop: 10 }}>
<div className='col-sm-12 col-lg-12'>
<div className='ms-Grid-row' style={{ marginTop: 10 }}>
<div className='ms-Grid-col ms-sm-12 ms-lg-12'>
{
// @ts-ignore
<Request
Expand Down