Skip to content

Commit

Permalink
changing font color and adding small descriptive text
Browse files Browse the repository at this point in the history
  • Loading branch information
cupton15 committed Jun 3, 2021
1 parent 0f98e6b commit 38a9b28
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 4 deletions.
16 changes: 14 additions & 2 deletions src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,23 @@ function App(): JSX.Element {
};

return (
<div className="grid h-screen grid-cols-1 grid-rows-header">
<div className="grid h-screen grid-cols-1 grid-rows-header text-gray-500">
<Header />

<div className="App flex flex-col self-center items-center justify-items-center">
{!submitted && <SalaryCheckForm onSubmit={onSubmit} />}
{!submitted && (
<>
<div className="mb-8 px-4">
<p>
Sometimes you need a reality check when it comes to your
earnings.
</p>
<p>Spoiler alert: You&apos;ll be fine</p>
</div>

<SalaryCheckForm onSubmit={onSubmit} />
</>
)}
{submitted && jobInfo && <SalaryResults jobInfo={jobInfo} />}
{submitted && <Button text="Reset" onClick={reset} />}
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/components/salary results/SalaryResults.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ export default function SalaryResults({ jobInfo }: ResultProps): JSX.Element {
const salaryData =
jobInfo.type === 'FullTime' ? ukJobData.fullTime[0] : ukJobData.partTime[0];
return (
<div className="flex flex-col items-center text-xl md:text-4xl p-5 gap-y-2 text-gray-600">
<div className="flex flex-col items-center text-xl md:text-4xl p-5 gap-y-2">
<MedianText
salary={jobInfo.salary}
medianSalary={salaryData.medianSalary}
Expand Down
2 changes: 1 addition & 1 deletion tailwind.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ module.exports = {
'1/6': '16.66%',
},
gridTemplateRows: {
header: '15% auto 50px',
header: '12% auto 50px',
},
fontFamily: {
sans: ['Raleway', ...defaultTheme.fontFamily.sans],
Expand Down

0 comments on commit 38a9b28

Please sign in to comment.