Skip to content
This repository was archived by the owner on Jan 12, 2026. It is now read-only.

Fixed bug where two scrollbars showed up on diffs page #296

Merged
acunniffe merged 7 commits into from
Aug 6, 2020
Merged

Fixed bug where two scrollbars showed up on diffs page #296

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
3b201bb
fixed scrolling issue
trulyronak Jul 28, 2020
cda31dc
Revert "fixed scrolling issue"
trulyronak Aug 4, 2020
fbae06e
removed unneeded height settings and overflows
trulyronak Aug 4, 2020
7a15b67
Merge branch 'develop' of https://github.com/opticdev/optic into fix/…
trulyronak Aug 4, 2020
77b58b0
switched to visible and theme.spacing
trulyronak Aug 5, 2020
65688d7
Merge branch 'develop' into fix/double-scrollbar
trulyronak Aug 5, 2020
6bd4851
Merge branch 'develop' into fix/double-scrollbar
acunniffe Aug 6, 2020
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
9 changes: 3 additions & 6 deletions workspaces/ui/src/components/diff/v2/CaptureManagerPage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -651,7 +651,6 @@ const Stat = ({ number, label }) => {
const useStyles = makeStyles((theme) => ({
container: {
display: 'flex',
height: '100vh',
overflow: 'hidden',
},
navigationContainer: {
Expand All @@ -663,16 +662,15 @@ const useStyles = makeStyles((theme) => ({
display: 'flex',
flexGrow: 1,
flexShrink: 1,
overflow: 'scroll',
height: '100vh',
justifyContent: 'center',
},
navRoot: {
flexGrow: 1,
position: 'fixed',
width: 'inherit',
height: '100vh',
overflowY: 'scroll',
overflowY: 'visible',
Comment thread
JaapRood marked this conversation as resolved.
overflowX: 'hidden',
display: 'flex',
flexDirection: 'column',
borderRight: `1px solid ${theme.palette.grey[300]}`,
Expand All @@ -686,7 +684,6 @@ const useStyles = makeStyles((theme) => ({
},
center: {
flex: 1,
paddingBottom: 300,
maxWidth: 1200,
},
statsSection: {
Expand Down Expand Up @@ -747,7 +744,7 @@ const useStyles = makeStyles((theme) => ({
},
diffContainer: {
display: 'flex',
height: '100vh',

paddingLeft: 32,
paddingRight: 32,
flexDirection: 'row',
Expand Down
9 changes: 3 additions & 6 deletions workspaces/ui/src/components/diff/v2/DiffReviewPage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,6 @@ export function DiffReviewPage(props) {
const useStyles = makeStyles((theme) => ({
container: {
display: 'flex',
height: '100vh',
overflow: 'hidden',
},
navigationContainer: {
Expand All @@ -251,8 +250,6 @@ const useStyles = makeStyles((theme) => ({
display: 'flex',
},
pageContainer: {
overflow: 'scroll',
height: '100vh',
justifyContent: 'center',
flexGrow: 1,
},
Expand All @@ -261,7 +258,8 @@ const useStyles = makeStyles((theme) => ({
position: 'fixed',
width: 'inherit',
height: '100vh',
overflowY: 'scroll',
overflowY: 'visible',
overflowX: 'visible',
display: 'flex',
flexDirection: 'column',
borderRight: `1px solid ${theme.palette.grey[300]}`,
Expand All @@ -275,7 +273,6 @@ const useStyles = makeStyles((theme) => ({
paddingTop: 16,
flexGrow: 1,
flexShirnk: 1,
overflow: 'scroll',
},
tabs: {
marginLeft: theme.spacing(2),
Expand All @@ -291,7 +288,7 @@ const useStyles = makeStyles((theme) => ({
paddingLeft: 20,
paddingRight: 20,
paddingTop: 20,
paddingBottom: 400,
paddingBottom: theme.spacing(1),
margin: '0 auto',
},
statsSection: {
Expand Down