Skip to content

Commit 43fcf8f

Browse files
authored
Merge pull request #3285 from codecrafters-io/update-text-color-to-gray700
style: replace all instances of slate-700 text color with gray-700
2 parents 7399c55 + 490c3c4 commit 43fcf8f

File tree

6 files changed

+19
-20
lines changed

6 files changed

+19
-20
lines changed

app/components/affiliate-page/join-affiliate-program-container.hbs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<h1 class="font-bold text-xl sm:text-4xl text-slate-600 text-center w-fit mb-3 mx-auto shrink-0">
1+
<h1 class="font-bold text-xl sm:text-4xl text-gray-600 text-center w-fit mb-3 mx-auto shrink-0">
22
Refer one friend to CodeCrafters.<br />
33
Earn up to $594. Right away.
44
</h1>

app/components/pay-page/monthly-challenge-banner.hbs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
{{this.monthlyChallengeBanner.payPageBannerTitle}}
1212
</div>
1313

14-
<div class="font-bold pt-4 pb-8 w-fit text-lg lg:text-2xl text-slate-600 group-hover/monthly-challenge-banner:text-slate-700">
14+
<div class="font-bold pt-4 pb-8 w-fit text-lg lg:text-2xl text-gray-600 group-hover/monthly-challenge-banner:text-gray-700">
1515
Complete 1 challenge.<br />
1616
{{this.monthlyChallengeBanner.payPageCta}}
1717
</div>

app/components/referrals-page/join-referral-program-container.hbs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<h1 class="font-bold text-xl sm:text-4xl text-slate-600 text-center w-fit mb-3 mx-auto shrink-0">
1+
<h1 class="font-bold text-xl sm:text-4xl text-gray-600 text-center w-fit mb-3 mx-auto shrink-0">
22
Gift one week, get one week.
33
</h1>
44

app/tailwind.config.js

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -78,14 +78,13 @@ module.exports = {
7878
black: 'black',
7979
blue: colors.sky,
8080
current: 'currentColor',
81-
gray: colors.slate,
81+
gray: colors.gray,
8282
green: colors.green,
8383
indigo: colors.indigo,
8484
purple: colors.purple,
8585
pink: colors.pink,
8686
red: colors.red,
8787
sky: colors.sky,
88-
slate: colors.slate,
8988
teal: colors.teal,
9089
transparent: 'transparent',
9190
yellow: colors.yellow,
@@ -101,9 +100,9 @@ module.exports = {
101100
},
102101
colors: {
103102
gray: {
104-
825: mixOklch(colors.slate[800], colors.slate[900], 0.25),
105-
850: mixOklch(colors.slate[800], colors.slate[900], 0.5),
106-
925: mixOklch(colors.slate[900], colors.slate[950], 0.5),
103+
825: mixOklch(colors.gray[800], colors.gray[900], 0.25),
104+
850: mixOklch(colors.gray[800], colors.gray[900], 0.5),
105+
925: mixOklch(colors.gray[900], colors.gray[950], 0.5),
107106
},
108107
},
109108
fontSize: {
@@ -112,16 +111,16 @@ module.exports = {
112111
typography: {
113112
DEFAULT: {
114113
css: {
115-
'--tw-prose-bold': colors.slate[800],
116-
'--tw-prose-code': colors.slate[700],
114+
'--tw-prose-bold': colors.gray[800],
115+
'--tw-prose-code': colors.gray[700],
117116
'--tw-prose-links': colors.sky[500],
118-
'--tw-prose-pre-bg': colors.slate[100],
119-
'--tw-prose-pre-code': colors.slate[700],
120-
'--tw-prose-invert-bold': colors.slate[200],
121-
'--tw-prose-invert-code': colors.slate[300],
122-
'--tw-prose-invert-headings': colors.slate[200],
117+
'--tw-prose-pre-bg': colors.gray[100],
118+
'--tw-prose-pre-code': colors.gray[700],
119+
'--tw-prose-invert-bold': colors.gray[200],
120+
'--tw-prose-invert-code': colors.gray[300],
121+
'--tw-prose-invert-headings': colors.gray[200],
123122
'--tw-prose-invert-links': colors.sky[500],
124-
'--tw-prose-invert-pre-bg': colors.slate[800],
123+
'--tw-prose-invert-pre-bg': colors.gray[800],
125124
maxWidth: '90ch', // Default is 65ch
126125
a: {
127126
fontWeight: '600',

app/templates/institution.hbs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939

4040
<div class="flex flex-col gap-4 justify-center items-center mt-16">
4141
<InstitutionPage::ClaimOfferButton @onClick={{this.handleClaimOfferButtonClick}} />
42-
<div class="text-xs text-slate-700 text-center">Get a free 1 year membership</div>
42+
<div class="text-xs text-gray-700 text-center">Get a free 1 year membership</div>
4343
</div>
4444

4545
<h2 class="text-2xl font-bold text-gray-925 md:text-3xl text-center mt-16">
@@ -54,7 +54,7 @@
5454

5555
<div class="flex flex-col gap-4 justify-center items-center mt-16">
5656
<InstitutionPage::ClaimOfferButton @onClick={{this.handleClaimOfferButtonClick}} />
57-
<div class="text-xs text-slate-700 text-center">Get a free 1 year membership</div>
57+
<div class="text-xs text-gray-700 text-center">Get a free 1 year membership</div>
5858
</div>
5959
</div>
6060
</div>

app/templates/join.hbs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141

4242
<div class="flex flex-col gap-4 justify-center items-center mt-16">
4343
<AffiliateLinkPage::AcceptReferralButton @affiliateLink={{this.model.affiliateLink}} />
44-
<div class="text-xs text-slate-700 text-center">Get access to 40% off via @{{this.model.affiliateLink.affiliateName}}</div>
44+
<div class="text-xs text-gray-700 text-center">Get access to 40% off via @{{this.model.affiliateLink.affiliateName}}</div>
4545
</div>
4646

4747
<h2 class="text-2xl font-bold text-gray-925 md:text-3xl text-center mt-16">
@@ -56,7 +56,7 @@
5656

5757
<div class="flex flex-col gap-4 justify-center items-center mt-16">
5858
<AffiliateLinkPage::AcceptReferralButton @affiliateLink={{this.model.affiliateLink}} />
59-
<div class="text-xs text-slate-700 text-center">Get access to 40% off via @{{this.model.affiliateLink.affiliateName}}</div>
59+
<div class="text-xs text-gray-700 text-center">Get access to 40% off via @{{this.model.affiliateLink.affiliateName}}</div>
6060
</div>
6161
</div>
6262
</div>

0 commit comments

Comments
 (0)