Skip to content

Commit e55bec9

Browse files
authored
Merge pull request #523 from brianlovin/single-col
Refactor site to be more visually simple, add new content
2 parents 7a57c20 + b504116 commit e55bec9

File tree

32 files changed

+350
-582
lines changed

32 files changed

+350
-582
lines changed

.gitignore

+3-1
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,7 @@ node_modules
22
.next
33
.DS_Store
44
.env
5+
.env.build
56
.vscode
6-
yarn-error.log
7+
yarn-error.log
8+
.now

cypress/integration/home_spec.ts

-10
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,4 @@ describe('Home', () => {
1919
.scrollIntoView()
2020
.should('be.visible');
2121
});
22-
23-
it('should render podcast player', () => {
24-
cy.get('[data-cy="design-details-player"]')
25-
.scrollIntoView()
26-
.should('be.visible');
27-
28-
cy.get(`[href="https://designdetails.fm"]`).should(
29-
'be.visible'
30-
);
31-
});
3222
});

now.json

+19-17
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,24 @@
33
"github": {
44
"silent": true
55
},
6-
"env": {
7-
"MAILCHIMP_API_KEY": "@mailchimp-api-key",
8-
"MAILCHIMP_LIST_ID": "@mailchimp-list-id",
9-
"TWILIO_ACCOUNT_SID": "@twilio-account-sid",
10-
"TWILIO_AUTH_TOKEN": "@twilio-auth-token",
11-
"TWILIO_PHONE_NUMBER": "@twilio-phone-number",
12-
"MY_PHONE_NUMBER": "@my-phone-number",
13-
"FIREBASE_TYPE": "@firebase-type",
14-
"FIREBASE_PROJECT_ID": "@firebase-project-id",
15-
"FIREBASE_PRIVATE_KEY_ID": "@firebase-private-key-id",
16-
"FIREBASE_PRIVATE_KEY": "@firebase-private-key",
17-
"FIREBASE_CLIENT_EMAIL": "@firebase-client-email",
18-
"FIREBASE_CLIENT_ID": "@firebase-client-id",
19-
"FIREBASE_AUTH_URI": "@firebase-auth-uri",
20-
"FIREBASE_TOKEN_URI": "@firebase-token-uri",
21-
"FIREBASE_AUTH_PROVIDER_X509_CERT_URL": "@firebase-auth-provider-x509-cert-url",
22-
"FIREBASE_CLIENT_X509_CERT_URL": "@firebase-client-x509-cert-url"
6+
"build": {
7+
"env": {
8+
"MAILCHIMP_API_KEY": "@mailchimp-api-key",
9+
"MAILCHIMP_LIST_ID": "@mailchimp-list-id",
10+
"TWILIO_ACCOUNT_SID": "@twilio-account-sid",
11+
"TWILIO_AUTH_TOKEN": "@twilio-auth-token",
12+
"TWILIO_PHONE_NUMBER": "@twilio-phone-number",
13+
"MY_PHONE_NUMBER": "@my-phone-number",
14+
"FIREBASE_TYPE": "@firebase-type",
15+
"FIREBASE_PROJECT_ID": "@firebase-project-id",
16+
"FIREBASE_PRIVATE_KEY_ID": "@firebase-private-key-id",
17+
"FIREBASE_PRIVATE_KEY": "@firebase-private-key",
18+
"FIREBASE_CLIENT_EMAIL": "@firebase-client-email",
19+
"FIREBASE_CLIENT_ID": "@firebase-client-id",
20+
"FIREBASE_AUTH_URI": "@firebase-auth-uri",
21+
"FIREBASE_TOKEN_URI": "@firebase-token-uri",
22+
"FIREBASE_AUTH_PROVIDER_X509_CERT_URL": "@firebase-auth-provider-x509-cert-url",
23+
"FIREBASE_CLIENT_X509_CERT_URL": "@firebase-client-x509-cert-url"
24+
}
2325
}
2426
}

src/components/Bookmarks/index.tsx

-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import * as React from 'react';
22
import { Bookmark } from '~/types'
3-
import { P } from '../Typography';
43
import { ListItem, Grid, Url, Title } from './style'
54

65
interface Props {
@@ -11,11 +10,8 @@ function BookmarkListItem({ bookmark }: { bookmark: Bookmark }) {
1110
return (
1211
<ListItem href={bookmark.url} target="_blank" rel="noopener noreferrer">
1312
<Title>
14-
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round" ><path d="M10 13a5 5 0 0 0 7.54.54l3-3a5 5 0 0 0-7.07-7.07l-1.72 1.71"></path><path d="M14 11a5 5 0 0 0-7.54-.54l-3 3a5 5 0 0 0 7.07 7.07l1.71-1.71"></path></svg>
15-
1613
{bookmark.title || bookmark.url}
1714
</Title>
18-
{bookmark.description && <P>{bookmark.description.slice(0, 140)}...</P>}
1915
<Url>{bookmark.host || bookmark.url}</Url>
2016
</ListItem>
2117
)

src/components/Bookmarks/style.tsx

+5-13
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,10 @@ import { p } from '../Typography'
44

55
export const Grid = styled.div`
66
display: grid;
7-
max-width: ${defaultTheme.breakpoints[3]};
8-
margin-top: ${defaultTheme.space[7]};
9-
grid-gap: ${defaultTheme.space[6]};
7+
width: 100%;
8+
max-width: ${defaultTheme.breakpoints[4]};
9+
margin-top: ${defaultTheme.space[5]};
10+
grid-gap: ${defaultTheme.space[3]};
1011
grid-template-columns: 1fr;
1112
1213
@media (max-width: ${defaultTheme.breakpoints[4]}) {
@@ -17,23 +18,14 @@ export const Grid = styled.div`
1718

1819
export const Title = styled.p`
1920
${p};
20-
font-size: 1.1rem;
2121
font-weight: 700;
2222
display: grid;
2323
align-items: center;
24-
grid-gap: ${defaultTheme.space[3]};
25-
grid-template-columns: 16px 1fr;
26-
27-
@media (max-width: ${defaultTheme.breakpoints[4]}) {
28-
grid-template-columns: 1fr;
29-
30-
svg { display: none }
31-
}
3224
`
3325

3426
export const ListItem = styled.a`
3527
display: grid;
36-
grid-gap: ${defaultTheme.space[2]};
28+
grid-gap: ${defaultTheme.space[0]};
3729
grid-template-columns: 1fr;
3830
3931
&:hover {

src/components/DesignDetailView/index.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ export default function DesignDetailView(props: Props) {
4949
<LargeSubheading>A visual exploration of digital products</LargeSubheading>
5050
<Subheading style={{ marginTop: '24px' }}>
5151
<Link href="/design-details">
52-
<A>View all posts <Rarr /></A>
52+
<A>See all posts <Rarr /></A>
5353
</Link>
5454
</Subheading>
5555
</SectionHeading>

src/components/DesignDetailsCard/style.tsx

+2-21
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ export const Container = styled.div`
3333
border-radius: 8px;
3434
transition: ${defaultTheme.animations.default};
3535
align-items: flex-start;
36-
height: 400px;
36+
height: 360px;
3737
overflow: hidden;
3838
z-index: 3;
3939
@@ -101,26 +101,7 @@ export const VideoPlayer = styled.video`
101101
min-height: 600px;
102102
border-radius: 4px;
103103
clip-path: padding-box;
104-
105-
@media (min-width: 1440px) {
106-
right: -48px;
107-
}
108-
109-
@media (max-width: 1440px) {
110-
right: -24%;
111-
}
112-
113-
@media (max-width: 1256px) {
114-
right: -18%;
115-
}
116-
117-
@media (max-width: 1024px) {
118-
right: -15%;
119-
}
120-
121-
@media (max-width: 968px) {
122-
right: -20px;
123-
}
104+
right: -3%;
124105
125106
@media (max-width: 968px) {
126107
display: none;

src/components/DesignDetailsPlayer/index.tsx

-98
This file was deleted.

src/components/DesignDetailsPlayer/style.tsx

-102
This file was deleted.

0 commit comments

Comments
 (0)