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.

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

Jump to bottom

fix: make schema layout more responsive on small screen #1411

Merged
merged 3 commits into from
Oct 13, 2020
Merged

fix: make schema layout more responsive on small screen #1411

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
c0509b3
fix: make schema layout more responsive on small screen
RomanHotsiy Oct 13, 2020
6f6fe57
fix: make authorizations responseive too
RomanHotsiy Oct 13, 2020
c10decb
fix: ie11 fix
RomanHotsiy Oct 13, 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
35 changes: 32 additions & 3 deletions src/common-elements/fields-layout.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// import { transparentize } from 'polished';

import styled, { extensionsHook } from '../styled-components';
import styled, { extensionsHook, media } from '../styled-components';
import { deprecatedCss } from './mixins';

export const PropertiesTableCaption = styled.caption`
Expand All @@ -16,6 +16,11 @@ export const PropertyCell = styled.td<{ kind?: string }>`
position: relative;
padding: 10px 10px 10px 0;

${media.lessThan('small')`
display: block;
overflow: hidden;
`}

tr:first-of-type > &,
tr.last > & {
border-left-width: 0;
Expand Down Expand Up @@ -63,7 +68,7 @@ export const PropertyNameCell = styled(PropertyCell)`
line-height: 20px;
white-space: nowrap;
font-size: 13px;
font-family: ${props => props.theme.typography.code.fontFamily};
font-family: ${(props) => props.theme.typography.code.fontFamily};

&.deprecated {
${deprecatedCss};
Expand All @@ -77,12 +82,22 @@ export const PropertyNameCell = styled(PropertyCell)`
export const PropertyDetailsCell = styled.td`
border-bottom: 1px solid #9fb4be;
padding: 10px 0;
width: ${props => props.theme.schema.defaultDetailsWidth};
width: ${(props) => props.theme.schema.defaultDetailsWidth};
box-sizing: border-box;

tr.expanded & {
border-bottom: none;
}

${media.lessThan('small')`
padding: 0 20px;
border-bottom: none;
border-left: 1px solid ${(props) => props.theme.schema.linesColor};

tr.last > & {
border-left: none;
}
`}
`;

export const PropertyBullet = styled.span`
Expand Down Expand Up @@ -125,6 +140,20 @@ export const PropertiesTable = styled.table`
vertical-align: middle;
}

${media.lessThan('small')`
display: block;
> tr, > tbody > tr {
display: block;
}
`}

${media.lessThan('small', false, ' and (-ms-high-contrast:none)')`
td {
float: left;
width: 100%;
}
`}

&
${InnerPropertiesWrap},
&
Expand Down
11 changes: 9 additions & 2 deletions src/components/SecurityRequirement/SecurityRequirement.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// import { transparentize } from 'polished';
import * as React from 'react';

import styled from '../../styled-components';
import styled, { media } from '../../styled-components';

import { Link, UnderlinedHeader } from '../../common-elements/';
import { SecurityRequirementModel } from '../../services/models/SecurityRequirement';
Expand Down Expand Up @@ -85,11 +85,14 @@ export class SecurityRequirement extends React.PureComponent<SecurityRequirement
}

const AuthHeaderColumn = styled.div`
flex: 1;
flex: 1 1 auto;
`;

const SecuritiesColumn = styled.div`
width: ${props => props.theme.schema.defaultDetailsWidth};
${media.lessThan('small')`
margin-top: 10px;
`}
`;

const AuthHeader = styled(UnderlinedHeader)`
Expand All @@ -101,6 +104,10 @@ const Wrap = styled.div`
width: 100%;
display: flex;
margin: 1em 0;

${media.lessThan('small')`
flex-direction: column;
`}
`;

export interface SecurityRequirementsProps {
Expand Down
4 changes: 2 additions & 2 deletions src/styled-components.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ const {
} = styledComponents as styledComponents.ThemedStyledComponentsModule<ResolvedThemeInterface>;

export const media = {
lessThan(breakpoint, print?: boolean) {
lessThan(breakpoint, print?: boolean, extra?: string) {
return (...args) => css`
@media ${print ? 'print, ' : ''} screen and (max-width: ${props =>
props.theme.breakpoints[breakpoint]}) {
props.theme.breakpoints[breakpoint]})${extra || ''} {
${(css as any)(...args)};
}
`;
Expand Down