Skip to content

fix(twitter): application board layout on mobile #5726

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.

Sign up for GitHub

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

Merged
UncleBill merged 3 commits into from
Mar 2, 2022
Merged

fix(twitter): application board layout on mobile #5726

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
870027c
fix(twitter): application board layout on mobile
UncleBill Feb 22, 2022
ad21e0c
fix(ui): some ui on mobile
UncleBill Feb 22, 2022
b0b3517
fix(ui): some ui on mobile
UncleBill Feb 23, 2022
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
146 changes: 80 additions & 66 deletions packages/mask/src/components/shared/ApplicationBoard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,74 +18,88 @@ import { TraderDialog } from '../../plugins/Trader/SNSAdaptor/trader/TraderDialo
import { NetworkPluginID, PluginId, usePluginIDContext } from '@masknet/plugin-infra'
import { FindTrumanDialog } from '../../plugins/FindTruman/SNSAdaptor/FindTrumanDialog'

const useStyles = makeStyles()((theme) => ({
abstractTabWrapper: {
position: 'sticky',
top: 0,
width: '100%',
zIndex: 2,
paddingTop: theme.spacing(1),
paddingBottom: theme.spacing(2),
backgroundColor: theme.palette.background.paper,
},
tab: {
height: 36,
minHeight: 36,
fontWeight: 300,
},
tabs: {
width: 552,
height: 36,
minHeight: 36,
margin: '0 auto',
borderRadius: 4,
'& .Mui-selected': {
color: theme.palette.primary.contrastText,
backgroundColor: theme.palette.primary.main,
const useStyles = makeStyles()((theme) => {
const smallQuery = `@media (max-width: ${theme.breakpoints.values.sm}px)`
return {
abstractTabWrapper: {
position: 'sticky',
top: 0,
width: '100%',
zIndex: 2,
paddingTop: theme.spacing(1),
paddingBottom: theme.spacing(2),
backgroundColor: theme.palette.background.paper,
},
},
tabPanel: {
marginTop: theme.spacing(3),
},
indicator: {
display: 'none',
},
applicationBox: {
display: 'flex',
flexDirection: 'column',
justifyContent: 'center',
alignItems: 'center',
backgroundColor: theme.palette.background.default,
borderRadius: '8px',
cursor: 'pointer',
height: 100,
'&:hover': {
transform: 'scale(1.05) translateY(-4px)',
boxShadow: theme.palette.mode === 'light' ? '0px 10px 16px rgba(0, 0, 0, 0.1)' : 'none',
tab: {
height: 36,
minHeight: 36,
fontWeight: 300,
},
},
applicationWrapper: {
marginTop: 4,
display: 'grid',
gridTemplateColumns: '123px 123px 123px 123px',
gridTemplateRows: '100px',
rowGap: 12,
justifyContent: 'space-between',
height: 324,
},
applicationImg: {
width: 36,
height: 36,
marginBottom: 10,
},
disabled: {
pointerEvents: 'none',
opacity: 0.5,
},
title: {
fontSize: 15,
},
}))
tabs: {
width: 552,
height: 36,
minHeight: 36,
margin: '0 auto',
borderRadius: 4,
'& .Mui-selected': {
color: theme.palette.primary.contrastText,
backgroundColor: theme.palette.primary.main,
},
},
tabPanel: {
marginTop: theme.spacing(3),
},
indicator: {
display: 'none',
},
applicationBox: {
display: 'flex',
flexDirection: 'column',
justifyContent: 'center',
alignItems: 'center',
backgroundColor: theme.palette.background.default,
borderRadius: '8px',
cursor: 'pointer',
height: 100,
'@media (hover: hover)': {
'&:hover': {
transform: 'scale(1.05) translateY(-4px)',
boxShadow: theme.palette.mode === 'light' ? '0px 10px 16px rgba(0, 0, 0, 0.1)' : 'none',
},
},
},
applicationWrapper: {
marginTop: theme.spacing(0.5),
display: 'grid',
gridTemplateColumns: 'repeat(4, 1fr)',
gridTemplateRows: '100px',
gridGap: theme.spacing(1.5),
justifyContent: 'space-between',
height: 324,
[smallQuery]: {
overflow: 'auto',
overscrollBehavior: 'contain',
gridTemplateColumns: 'repeat(3, 1fr)',
gridGap: theme.spacing(1),
},
},
applicationImg: {
width: 36,
height: 36,
marginBottom: theme.spacing(1),
},
disabled: {
pointerEvents: 'none',
opacity: 0.5,
},
title: {
fontSize: 15,
[smallQuery]: {
fontSize: 13,
},
},
}
})

const SUPPORTED_CHAIN_ID_LIST = [
ChainId.Mainnet,
Expand Down
3 changes: 3 additions & 0 deletions packages/mask/src/components/shared/InjectedDialog.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,9 @@ const useStyles = makeStyles<StyleProps>()((theme, { snsId }) => ({
padding: theme.spacing(1, 2),
borderBottom: `1px solid ${theme.palette.divider}`,
},
dialogContent: {
overscrollBehavior: 'contain',
},
dialogTitleTypography: {
marginLeft: 6,
verticalAlign: 'middle',
Expand Down
Loading