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

test #209

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

test #209

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
2 changes: 1 addition & 1 deletion live-site/components/coming-up/ComingUp.styles.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import styled from 'styled-components';
import styled from '@emotion/styled';
import { max } from '../../../shared-ui/lib/responsive';
import { colors } from '../../../shared-ui/style/colors';
import { fonts, H3, P } from '../../../shared-ui/style/typography';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import styled from 'styled-components';
import styled from '@emotion/styled';
import { max } from '../../../../shared-ui/lib/responsive';
import { colors } from '../../../../shared-ui/style/colors';
import { H2 } from '../../../../shared-ui/style/typography';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import styled from 'styled-components';
import styled from '@emotion/styled';
import { max } from '../../../shared-ui/lib/responsive';
import { colors } from '../../../shared-ui/style/colors';
import { H3, P } from '../../../shared-ui/style/typography';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import styled from 'styled-components';
import styled from '@emotion/styled';
import { max } from '../../../../shared-ui/lib/responsive';
import { colors } from '../../../../shared-ui/style/colors';
import { P } from '../../../../shared-ui/style/typography';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import styled from 'styled-components';
import styled from '@emotion/styled';
import { max } from '../../../../shared-ui/lib/responsive';
import { colors } from '../../../../shared-ui/style/colors';
import { H3, P } from '../../../../shared-ui/style/typography';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import styled from 'styled-components';
import styled from '@emotion/styled';
import { max } from '../../../../shared-ui/lib/responsive';
import { colors } from '../../../../shared-ui/style/colors';
import { P } from '../../../../shared-ui/style/typography';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import styled from 'styled-components';
import styled from '@emotion/styled';
import { fonts } from '../../../shared-ui/style/typography';
import { colors } from '../../../shared-ui/style/colors';
import { P } from '../../../shared-ui/style/typography';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import styled from 'styled-components';
import styled from '@emotion/styled';
import { P } from '../../../shared-ui/style/typography';
import { colors } from '../../../shared-ui/style/colors';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import styled from 'styled-components';
import styled from '@emotion/styled';
import { max } from '../../../../shared-ui/lib/responsive';
import { colors } from '../../../../shared-ui/style/colors';
import { fonts } from '../../../../shared-ui/style/typography';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import styled from 'styled-components';
import styled from '@emotion/styled';
import { H2 } from '../../../../shared-ui/style/typography';
import { colors } from '../../../../shared-ui/style/colors';
import { max } from '../../../../shared-ui/lib/responsive';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import styled from 'styled-components';
import styled from '@emotion/styled';
import { min, max } from '../../../../shared-ui/lib/responsive';
import { colors } from '../../../../shared-ui/style/colors';
import { H2 } from '../../../../shared-ui/style/typography';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import styled from 'styled-components';
import styled from '@emotion/styled';
import { max, min } from '../../../shared-ui/lib/responsive';
import { H3 } from '../../../shared-ui/style/typography';
import { colors } from '../../../shared-ui/style/colors';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import styled from 'styled-components';
import styled from '@emotion/styled';
import { colors } from '../../../../shared-ui/style/colors';
import { max } from '../../../../shared-ui/lib/responsive';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import styled from 'styled-components';
import styled from '@emotion/styled';
import { max } from '../../../shared-ui/lib/responsive';
import { fonts, H3 } from '../../../shared-ui/style/typography';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import styled from 'styled-components';
import styled from '@emotion/styled';
import { max } from '../../../../shared-ui/lib/responsive';
import { fonts } from '../../../../shared-ui/style/typography';
import { colors } from '../../../../shared-ui/style/colors';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import styled from 'styled-components';
import styled from '@emotion/styled';
import { max, min } from '../../../shared-ui/lib/responsive';
import { colors } from '../../../shared-ui/style/colors';
import { P, H3 } from '../../../shared-ui/style/typography';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import styled from 'styled-components';
import styled from '@emotion/styled';
import { H3, P } from '../../../../shared-ui/style/typography';
import { colors } from '../../../../shared-ui/style/colors';
import { max } from '../../../../shared-ui/lib/responsive';
Expand Down
2 changes: 1 addition & 1 deletion live-site/styled-components/SecondarySelect.styles.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import styled from 'styled-components';
import styled from '@emotion/styled';
import { min } from '../../shared-ui/lib/responsive';
import { colors } from '../../shared-ui/style/colors';
import { fonts } from '../../shared-ui/style/typography';
Expand Down
2 changes: 1 addition & 1 deletion main-site/components/about-section/AboutSection.styles.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import styled from 'styled-components';
import styled from '@emotion/styled';
import { H2, H3, P } from '../../../shared-ui/style/typography';
import { min } from '../../../shared-ui/lib/responsive';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import styled from 'styled-components';
import styled from '@emotion/styled';
import { P } from '../../../shared-ui/style/typography';
import { max } from '../../../shared-ui/lib/responsive';
import { colors } from '../../../shared-ui/style/colors';
Expand Down
2 changes: 1 addition & 1 deletion main-site/components/covid-section/CovidSection.styles.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import styled from 'styled-components';
import styled from '@emotion/styled';
import { P } from '../../../shared-ui/style/typography';
import { min } from '../../../shared-ui/lib/responsive';
import { H2 } from '../../../shared-ui/style/typography';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import styled from 'styled-components';
import styled from '@emotion/styled';
import { max, min } from '../../../shared-ui/lib/responsive';
import { colors } from '../../../shared-ui/style/colors';
import { fonts, H2, P } from '../../../shared-ui/style/typography';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import styled from 'styled-components';
import styled from '@emotion/styled';
import { colors } from '../../../shared-ui/style/colors';
import { P } from '../../../shared-ui/style/typography';
import { min, max } from '../../../shared-ui/lib/responsive';
Expand Down
2 changes: 1 addition & 1 deletion main-site/components/faq-section/FaqSection.styles.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import styled from 'styled-components';
import styled from '@emotion/styled';
import { max } from '../../../shared-ui/lib/responsive';
import { colors } from '../../../shared-ui/style/colors';
import { H4 } from '../../../shared-ui/style/typography';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import styled from 'styled-components';
import styled from '@emotion/styled';
import { colors } from '../../../../shared-ui/style/colors';
import { H4, P } from '../../../../shared-ui/style/typography';
import { max } from '../../../../shared-ui/lib/responsive';
Expand Down
2 changes: 1 addition & 1 deletion main-site/components/faq-section/faq/Faq.styles.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import styled from 'styled-components';
import styled from '@emotion/styled';
import { max } from '../../../../shared-ui/lib/responsive';
import { colors } from '../../../../shared-ui/style/colors';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { motion } from 'framer-motion';
import styled from 'styled-components';
import styled from '@emotion/styled';
import PrimaryButton from '../../../shared-ui/components/primary-button/PrimaryButton';
import { max } from '../../../shared-ui/lib/responsive';
import { colors } from '../../../shared-ui/style/colors';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import styled from 'styled-components';
import styled from '@emotion/styled';
import { max } from '../../../shared-ui/lib/responsive';
import { StyledLocationSectionProps } from '../../../shared-ui/lib/types';
import { colors } from '../../../shared-ui/style/colors';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import styled from 'styled-components';
import styled from '@emotion/styled';
import { max } from '../../../shared-ui/lib/responsive';

const StyledPhotosSection = styled.div`
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import styled from 'styled-components';
import styled from '@emotion/styled';
import { colors } from '../../../shared-ui/style/colors';
import { H2, P } from '../../../shared-ui/style/typography';
import { max } from '../../../shared-ui/lib/responsive';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import styled from 'styled-components';
import styled from '@emotion/styled';
import { max } from '../../../shared-ui/lib/responsive';
import { colors } from '../../../shared-ui/style/colors';
import { H2, H4 } from '../../../shared-ui/style/typography';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import styled from 'styled-components';
import styled from '@emotion/styled';

const StyledTestimonialsSectionContainer = styled.div`
text-align: center;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import styled from 'styled-components';
import styled from '@emotion/styled';
import { max } from '../../../../shared-ui/lib/responsive';
import { colors } from '../../../../shared-ui/style/colors';
import { H4, P } from '../../../../shared-ui/style/typography';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import styled from 'styled-components';
import styled from '@emotion/styled';
import { max } from '../../../../shared-ui/lib/responsive';
import { colors } from '../../../../shared-ui/style/colors';
import { fonts } from '../../../../shared-ui/style/typography';
Expand Down
2 changes: 1 addition & 1 deletion main-site/src/page-styles/code-of-conduct.styles.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import styled from 'styled-components';
import styled from '@emotion/styled';
import { colors } from '../../../shared-ui/style/colors';
import { H2, P } from '../../../shared-ui/style/typography';
import { max } from '../../../shared-ui/lib/responsive';
Expand Down
2 changes: 1 addition & 1 deletion main-site/src/pages/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ const IndexPage: React.FC = () => {
if (isLoading) {
return null;
}

// hi
return (
<StyledPageContainer className={getBackgroundClassName()}>
<Header tabs={mainSiteTabInfo} isDay={isDay} />
Expand Down
2 changes: 2 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,8 @@
"typescript": "^4.7.4"
},
"dependencies": {
"@emotion/react": "^11.11.1",
"@emotion/styled": "11.10.6",
"babel-plugin-styled-components": "^2.0.7",
"framer-motion": "^7.10.0",
"gatsby-plugin-mailchimp": "^5.2.2",
Expand Down
2 changes: 1 addition & 1 deletion shared-ui/components/404/404.styles.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import styled from 'styled-components';
import styled from '@emotion/styled';
import { fonts, H1, H4 } from '../../style/typography';
import { colors } from '../../style/colors';
import { max } from '../../lib/responsive';
Expand Down
2 changes: 1 addition & 1 deletion shared-ui/components/arrow/Arrow.styles.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import styled from 'styled-components';
import styled from '@emotion/styled';

const StyledArrow = styled.img`
z-index: 5;
Expand Down
2 changes: 1 addition & 1 deletion shared-ui/components/footer/Footer.styles.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import styled from 'styled-components';
import styled from '@emotion/styled';
import { min, max } from '../../../shared-ui/lib/responsive';
import { StyledFooterProps } from '../../lib/types';
import { colors } from '../../style/colors';
Expand Down
2 changes: 1 addition & 1 deletion shared-ui/components/header/Header.styles.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import styled from 'styled-components';
import styled from '@emotion/styled';
import { max, min } from '../../lib/responsive';
import { StyledHeaderProps } from '../../lib/types';
import { colors } from '../../style/colors';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import styled from 'styled-components';
import styled from '@emotion/styled';
import { P } from '../../style/typography';

const StyledMailingMessage = styled(P)`
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import styled from 'styled-components';
import styled from '@emotion/styled';

const StyledMeetTheTeamSection = styled.div`
padding-top: 12em, 0;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import styled from 'styled-components';
import styled from '@emotion/styled';
import { P, H3 } from '../../../style/typography';
import { colors } from '../../../style/colors';
import { max, min } from '../../../lib/responsive';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import styled from 'styled-components';
import styled from '@emotion/styled';
import { max } from '../../../../lib/responsive';

const StyledTeamColumn = styled.div`
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import styled from 'styled-components';
import styled from '@emotion/styled';
import { max } from '../../../../lib/responsive';

const StyledMobileTeamColumn = styled.div`
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import styled from 'styled-components';
import styled from '@emotion/styled';
import { team } from '../../../lib/data';
import { max } from '../../../lib/responsive';
import { StyledToolTipProps } from '../../../lib/types';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import styled from 'styled-components';
import styled from '@emotion/styled';
import { colors } from '../../style/colors';
import { fonts } from '../../style/typography';
import { min } from '../../lib/responsive';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import styled from 'styled-components';
import styled from '@emotion/styled';
import { max } from '../../lib/responsive';
import { StyledSecondaryButtonProps } from '../../lib/types';
import { colors } from '../../style/colors';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import styled from 'styled-components';
import styled from '@emotion/styled';
import { max } from '../../lib/responsive';
import { colors } from '../../style/colors';
import { fonts, H2, P } from '../../style/typography';
Expand Down
2 changes: 1 addition & 1 deletion shared-ui/components/toggle-mode/ToggleMode.styles.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import styled from 'styled-components';
import styled from '@emotion/styled';
import { max } from '../../lib/responsive';

const ToggleContainer = styled.div.attrs(
Expand Down
2 changes: 1 addition & 1 deletion shared-ui/style/typography.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import styled from 'styled-components';
import styled from '@emotion/styled';
import { min } from '../lib/responsive';
import { colors } from './colors';

Expand Down
2 changes: 1 addition & 1 deletion shared-ui/styled-components/Background.styles.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import styled from 'styled-components';
import styled from '@emotion/styled';

const StyledBackgrounds = styled.img`
width: 100%;
Expand Down