Skip to content

Commit 2227985

Browse files
authored
Update all dependencies and use standard Tailwind config. (vercel#94)
1 parent 1c86d75 commit 2227985

25 files changed

+768
-1137
lines changed

Diff for: assets/base.css

-118
This file was deleted.

Diff for: assets/components.css

-3
This file was deleted.

Diff for: assets/main.css

-7
This file was deleted.

Diff for: components/Pricing.tsx

+21-20
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,12 @@ import Button from 'components/ui/Button';
66
import { postData } from 'utils/helpers';
77
import { getStripe } from 'utils/stripe-client';
88
import { useUser } from 'utils/useUser';
9-
import { Product, Price, ProductWithPrice } from 'types';
9+
import { Price, ProductWithPrice } from 'types';
1010

1111
interface Props {
1212
products: ProductWithPrice[];
1313
}
14+
1415
type BillingInterval = 'year' | 'month';
1516

1617
export default function Pricing({ products }: Props) {
@@ -54,7 +55,7 @@ export default function Pricing({ products }: Props) {
5455
<p className="text-6xl font-extrabold text-white sm:text-center sm:text-6xl">
5556
No subscription pricing plans found. Create them in your{' '}
5657
<a
57-
className="text-pink underline"
58+
className="text-pink-500 underline"
5859
href="https://dashboard.stripe.com/products"
5960
rel="noopener noreferrer"
6061
target="_blank"
@@ -74,19 +75,19 @@ export default function Pricing({ products }: Props) {
7475
<h1 className="text-4xl font-extrabold text-white sm:text-center sm:text-6xl">
7576
Pricing Plans
7677
</h1>
77-
<p className="mt-5 text-xl text-accents-6 sm:text-center sm:text-2xl max-w-2xl m-auto">
78+
<p className="mt-5 text-xl text-gray-200 sm:text-center sm:text-2xl max-w-2xl m-auto">
7879
Start building for free, then add a site plan to go live. Account
7980
plans unlock additional features.
8081
</p>
81-
<div className="relative self-center mt-6 bg-primary-2 rounded-lg p-0.5 flex sm:mt-8 border border-accents-0">
82+
<div className="relative self-center mt-6 bg-gray-900 rounded-lg p-0.5 flex sm:mt-8 border border-gray-800">
8283
<button
8384
onClick={() => setBillingInterval('month')}
8485
type="button"
8586
className={`${
8687
billingInterval === 'month'
87-
? 'relative w-1/2 bg-accents-1 border-accents-0 shadow-sm text-white'
88-
: 'ml-0.5 relative w-1/2 border border-transparent text-accents-4'
89-
} rounded-md m-1 py-2 text-sm font-medium whitespace-nowrap focus:outline-none focus:ring-2 focus:ring-pink focus:ring-opacity-50 focus:z-10 sm:w-auto sm:px-8`}
88+
? 'relative w-1/2 bg-gray-700 border-gray-800 shadow-sm text-white'
89+
: 'ml-0.5 relative w-1/2 border border-transparent text-gray-400'
90+
} rounded-md m-1 py-2 text-sm font-medium whitespace-nowrap focus:outline-none focus:ring-2 focus:ring-pink-500 focus:ring-opacity-50 focus:z-10 sm:w-auto sm:px-8`}
9091
>
9192
Monthly billing
9293
</button>
@@ -95,9 +96,9 @@ export default function Pricing({ products }: Props) {
9596
type="button"
9697
className={`${
9798
billingInterval === 'year'
98-
? 'relative w-1/2 bg-accents-1 border-accents-0 shadow-sm text-white'
99-
: 'ml-0.5 relative w-1/2 border border-transparent text-accents-4'
100-
} rounded-md m-1 py-2 text-sm font-medium whitespace-nowrap focus:outline-none focus:ring-2 focus:ring-pink focus:ring-opacity-50 focus:z-10 sm:w-auto sm:px-8`}
99+
? 'relative w-1/2 bg-gray-700 border-gray-800 shadow-sm text-white'
100+
: 'ml-0.5 relative w-1/2 border border-transparent text-gray-400'
101+
} rounded-md m-1 py-2 text-sm font-medium whitespace-nowrap focus:outline-none focus:ring-2 focus:ring-pink-500 focus:ring-opacity-50 focus:z-10 sm:w-auto sm:px-8`}
101102
>
102103
Yearly billing
103104
</button>
@@ -118,9 +119,9 @@ export default function Pricing({ products }: Props) {
118119
<div
119120
key={product.id}
120121
className={cn(
121-
'rounded-lg shadow-sm divide-y divide-accents-2 bg-primary-2',
122+
'rounded-lg shadow-sm divide-y divide-gray-600 bg-gray-900',
122123
{
123-
'border border-pink': subscription
124+
'border border-pink-500': subscription
124125
? product.name ===
125126
subscription?.prices?.products?.[0]?.name
126127
: product.name === 'Freelancer'
@@ -131,12 +132,12 @@ export default function Pricing({ products }: Props) {
131132
<h2 className="text-2xl leading-6 font-semibold text-white">
132133
{product.name}
133134
</h2>
134-
<p className="mt-4 text-accents-5">{product.description}</p>
135+
<p className="mt-4 text-gray-300">{product.description}</p>
135136
<p className="mt-8">
136137
<span className="text-5xl font-extrabold white">
137138
{priceString}
138139
</span>
139-
<span className="text-base font-medium text-accents-8">
140+
<span className="text-base font-medium text-gray-100">
140141
/{billingInterval}
141142
</span>
142143
</p>
@@ -158,7 +159,7 @@ export default function Pricing({ products }: Props) {
158159
})}
159160
</div>
160161
<div>
161-
<p className="mt-24 text-xs uppercase text-accents-3 text-center font-bold tracking-widest">
162+
<p className="mt-24 text-xs uppercase text-gray-400 text-center font-bold tracking-[0.3em]">
162163
Brought to you by
163164
</p>
164165
<div className="flex flex-col items-center my-12 space-y-4 sm:mt-8 sm:space-y-0 md:mx-auto md:max-w-2xl sm:grid sm:gap-6 sm:grid-cols-5">
@@ -167,7 +168,7 @@ export default function Pricing({ products }: Props) {
167168
<img
168169
src="/nextjs.svg"
169170
alt="Next.js Logo"
170-
className="h-12 text-primary"
171+
className="h-12 text-white"
171172
/>
172173
</a>
173174
</div>
@@ -176,7 +177,7 @@ export default function Pricing({ products }: Props) {
176177
<img
177178
src="/vercel.svg"
178179
alt="Vercel.com Logo"
179-
className="h-6 text-primary"
180+
className="h-6 text-white"
180181
/>
181182
</a>
182183
</div>
@@ -185,7 +186,7 @@ export default function Pricing({ products }: Props) {
185186
<img
186187
src="/stripe.svg"
187188
alt="stripe.com Logo"
188-
className="h-12 text-primary"
189+
className="h-12 text-white"
189190
/>
190191
</a>
191192
</div>
@@ -194,7 +195,7 @@ export default function Pricing({ products }: Props) {
194195
<img
195196
src="/supabase.svg"
196197
alt="supabase.io Logo"
197-
className="h-10 text-primary"
198+
className="h-10 text-white"
198199
/>
199200
</a>
200201
</div>
@@ -203,7 +204,7 @@ export default function Pricing({ products }: Props) {
203204
<img
204205
src="/github.svg"
205206
alt="github.com Logo"
206-
className="h-8 text-primary"
207+
className="h-8 text-white"
207208
/>
208209
</a>
209210
</div>

Diff for: components/icons/Logo.tsx

+11-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,19 @@
11
const Logo = ({ className = '', ...props }) => (
2-
<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg" className={className} {...props}>
3-
<rect width="100%" height="100%" rx="16" fill="var(--secondary)" />
2+
<svg
3+
width="32"
4+
height="32"
5+
viewBox="0 0 32 32"
6+
fill="none"
7+
xmlns="http://www.w3.org/2000/svg"
8+
className={className}
9+
{...props}
10+
>
11+
<rect width="100%" height="100%" rx="16" fill="white" />
412
<path
513
fillRule="evenodd"
614
clipRule="evenodd"
715
d="M17.6482 10.1305L15.8785 7.02583L7.02979 22.5499H10.5278L17.6482 10.1305ZM19.8798 14.0457L18.11 17.1983L19.394 19.4511H16.8453L15.1056 22.5499H24.7272L19.8798 14.0457Z"
8-
fill="var(--primary)"
16+
fill="black"
917
/>
1018
</svg>
1119
);

Diff for: components/ui/Button/Button.module.css

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
.root {
2-
@apply bg-secondary text-accents-0 cursor-pointer inline-flex px-10 rounded-sm leading-6 transition ease-in-out duration-150 shadow-sm font-semibold text-center justify-center uppercase py-4 border border-transparent items-center;
2+
@apply bg-white text-gray-800 cursor-pointer inline-flex px-10 rounded-sm leading-6 transition ease-in-out duration-150 shadow-sm font-semibold text-center justify-center uppercase py-4 border border-transparent items-center;
33
}
44

55
.root:hover {
6-
@apply bg-accents-0 text-primary border border-secondary;
6+
@apply bg-gray-800 text-white border border-white;
77
}
88

99
.root:focus {
10-
@apply outline-none ring-2 ring-pink ring-opacity-50;
10+
@apply outline-none ring-2 ring-pink-500 ring-opacity-50;
1111
}
1212

1313
.root[data-active] {
1414
@apply bg-gray-600;
1515
}
1616

1717
.loading {
18-
@apply bg-accents-1 text-accents-3 border-accents-2 cursor-not-allowed;
18+
@apply bg-gray-700 text-gray-500 border-gray-600 cursor-not-allowed;
1919
}
2020

2121
.slim {
@@ -24,7 +24,7 @@
2424

2525
.disabled,
2626
.disabled:hover {
27-
@apply text-accents-4 border-accents-2 bg-accents-1 cursor-not-allowed;
27+
@apply text-gray-400 border-gray-600 bg-gray-700 cursor-not-allowed;
2828
filter: grayscale(1);
2929
-webkit-transform: translateZ(0);
3030
-webkit-perspective: 1000;

Diff for: components/ui/Footer/Footer.module.css

-9
This file was deleted.

0 commit comments

Comments
 (0)