Skip to content

fix(style): replace all instances of rem with em. #2760

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
TkDodo merged 2 commits into from
Oct 4, 2021
Merged

fix(style): replace all instances of rem with em. #2760

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4d601c2
fix(style): replace all instances of rem with em.
shihfu Oct 3, 2021
cfb5610
fix(style): resolve prettier check.
shihfu Oct 3, 2021
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
8 changes: 4 additions & 4 deletions src/devtools/Explorer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { styled } from './utils'

export const Entry = styled('div', {
fontFamily: 'Menlo, monospace',
fontSize: '0.9rem',
fontSize: '0.9em',
lineHeight: '1.7',
outline: 'none',
wordBreak: 'break-word',
Expand All @@ -22,14 +22,14 @@ export const Value = styled('span', (props, theme) => ({
}))

export const SubEntries = styled('div', {
marginLeft: '.1rem',
paddingLeft: '1rem',
marginLeft: '.1em',
paddingLeft: '1em',
borderLeft: '2px solid rgba(0,0,0,.15)',
})

export const Info = styled('span', {
color: 'grey',
fontSize: '.7rem',
fontSize: '.7em',
})

export const Expander = ({ expanded, style = {}, ...rest }) => (
Expand Down
60 changes: 30 additions & 30 deletions src/devtools/devtools.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,7 @@ export function ReactQueryDevtools({
style={{
position: 'fixed',
zIndex: 99999,
margin: '.5rem',
margin: '.5em',
bottom: 0,
...(position === 'top-right'
? {
Expand Down Expand Up @@ -313,8 +313,8 @@ export function ReactQueryDevtools({
position: 'fixed',
zIndex: 99999,
display: 'inline-flex',
fontSize: '1.5rem',
margin: '.5rem',
fontSize: '1.5em',
margin: '.5em',
cursor: 'pointer',
width: 'fit-content',
...(position === 'top-right'
Expand Down Expand Up @@ -458,8 +458,8 @@ export const ReactQueryDevtoolsPanel = React.forwardRef<
}

.ReactQueryDevtoolsPanel *::-webkit-scrollbar, .ReactQueryDevtoolsPanel scrollbar {
width: 1rem;
height: 1rem;
width: 1em;
height: 1em;
}

.ReactQueryDevtoolsPanel *::-webkit-scrollbar-track, .ReactQueryDevtoolsPanel scrollbar-track {
Expand All @@ -468,7 +468,7 @@ export const ReactQueryDevtoolsPanel = React.forwardRef<

.ReactQueryDevtoolsPanel *::-webkit-scrollbar-thumb, .ReactQueryDevtoolsPanel scrollbar-thumb {
background: ${theme.gray};
border-radius: .5rem;
border-radius: .5em;
border: 3px solid ${theme.backgroundAlt};
}
`,
Expand Down Expand Up @@ -500,7 +500,7 @@ export const ReactQueryDevtoolsPanel = React.forwardRef<
>
<div
style={{
padding: '.5rem',
padding: '.5em',
background: theme.backgroundAlt,
display: 'flex',
justifyContent: 'space-between',
Expand All @@ -510,7 +510,7 @@ export const ReactQueryDevtoolsPanel = React.forwardRef<
<Logo
aria-hidden
style={{
marginRight: '.5rem',
marginRight: '.5em',
}}
/>
<div
Expand All @@ -519,7 +519,7 @@ export const ReactQueryDevtoolsPanel = React.forwardRef<
flexDirection: 'column',
}}
>
<QueryKeys style={{ marginBottom: '.5rem' }}>
<QueryKeys style={{ marginBottom: '.5em' }}>
<QueryKey
style={{
background: theme.success,
Expand Down Expand Up @@ -571,7 +571,7 @@ export const ReactQueryDevtoolsPanel = React.forwardRef<
}}
style={{
flex: '1',
marginRight: '.5rem',
marginRight: '.5em',
}}
/>
{!filter ? (
Expand All @@ -583,7 +583,7 @@ export const ReactQueryDevtoolsPanel = React.forwardRef<
style={{
flex: '1',
minWidth: 75,
marginRight: '.5rem',
marginRight: '.5em',
}}
>
{Object.keys(sortFns).map(key => (
Expand All @@ -596,7 +596,7 @@ export const ReactQueryDevtoolsPanel = React.forwardRef<
type="button"
onClick={() => setSortDesc(old => !old)}
style={{
padding: '.3rem .4rem',
padding: '.3em .4em',
}}
>
{sortDesc ? '⬇ Desc' : '⬆ Asc'}
Expand Down Expand Up @@ -638,8 +638,8 @@ export const ReactQueryDevtoolsPanel = React.forwardRef<
<div
style={{
flex: '0 0 auto',
width: '2rem',
height: '2rem',
width: '2em',
height: '2em',
background: getQueryStatusColor(query, theme),
display: 'flex',
alignItems: 'center',
Expand All @@ -661,20 +661,20 @@ export const ReactQueryDevtoolsPanel = React.forwardRef<
<div
style={{
flex: '0 0 auto',
height: '2rem',
height: '2em',
background: theme.gray,
display: 'flex',
alignItems: 'center',
fontWeight: 'bold',
padding: '0 0.5rem',
padding: '0 0.5em',
}}
>
disabled
</div>
) : null}
<Code
style={{
padding: '.5rem',
padding: '.5em',
}}
>
{`${query.queryHash}`}
Expand All @@ -689,7 +689,7 @@ export const ReactQueryDevtoolsPanel = React.forwardRef<
<ActiveQueryPanel>
<div
style={{
padding: '.5rem',
padding: '.5em',
background: theme.backgroundAlt,
position: 'sticky',
top: 0,
Expand All @@ -700,20 +700,20 @@ export const ReactQueryDevtoolsPanel = React.forwardRef<
</div>
<div
style={{
padding: '.5rem',
padding: '.5em',
}}
>
<div
style={{
marginBottom: '.5rem',
marginBottom: '.5em',
display: 'flex',
alignItems: 'stretch',
justifyContent: 'space-between',
}}
>
<Code
style={{
lineHeight: '1.8rem',
lineHeight: '1.8em',
}}
>
<pre
Expand All @@ -728,8 +728,8 @@ export const ReactQueryDevtoolsPanel = React.forwardRef<
</Code>
<span
style={{
padding: '0.3rem .6rem',
borderRadius: '0.4rem',
padding: '0.3em .6em',
borderRadius: '0.4em',
fontWeight: 'bold',
textShadow: '0 2px 10px black',
background: getQueryStatusColor(activeQuery, theme),
Expand All @@ -741,7 +741,7 @@ export const ReactQueryDevtoolsPanel = React.forwardRef<
</div>
<div
style={{
marginBottom: '.5rem',
marginBottom: '.5em',
display: 'flex',
alignItems: 'center',
justifyContent: 'space-between',
Expand All @@ -767,7 +767,7 @@ export const ReactQueryDevtoolsPanel = React.forwardRef<
<div
style={{
background: theme.backgroundAlt,
padding: '.5rem',
padding: '.5em',
position: 'sticky',
top: 0,
zIndex: 1,
Expand All @@ -777,7 +777,7 @@ export const ReactQueryDevtoolsPanel = React.forwardRef<
</div>
<div
style={{
padding: '0.5rem',
padding: '0.5em',
}}
>
<Button
Expand Down Expand Up @@ -822,7 +822,7 @@ export const ReactQueryDevtoolsPanel = React.forwardRef<
<div
style={{
background: theme.backgroundAlt,
padding: '.5rem',
padding: '.5em',
position: 'sticky',
top: 0,
zIndex: 1,
Expand All @@ -832,7 +832,7 @@ export const ReactQueryDevtoolsPanel = React.forwardRef<
</div>
<div
style={{
padding: '.5rem',
padding: '.5em',
}}
>
<Explorer
Expand All @@ -844,7 +844,7 @@ export const ReactQueryDevtoolsPanel = React.forwardRef<
<div
style={{
background: theme.backgroundAlt,
padding: '.5rem',
padding: '.5em',
position: 'sticky',
top: 0,
zIndex: 1,
Expand All @@ -854,7 +854,7 @@ export const ReactQueryDevtoolsPanel = React.forwardRef<
</div>
<div
style={{
padding: '.5rem',
padding: '.5em',
}}
>
<Explorer
Expand Down
2 changes: 1 addition & 1 deletion src/devtools/styledComponents.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ export const Panel = styled(
flexDirection: 'column',
},
'(max-width: 600px)': {
fontSize: '.9rem',
fontSize: '.9em',
// flexDirection: 'column',
},
}
Expand Down