Skip to content

AS / feature add typography #3

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.

Sign up for GitHub

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

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

AS / feature add typography #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a45f624
added Astro components, tailwind variants, and fonts
May 21, 2026
73887be
added custom font sizes for mobile
May 22, 2026
0619638
pulled updates from main branch
May 22, 2026
67448e5
deleted Astro components and added onto global stylesheet
May 30, 2026
394bc2d
corrected classes for caption element
May 30, 2026
4456cbc
added blank line at the end of some files
May 30, 2026
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
51 changes: 47 additions & 4 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@
"astro": "^6.1.9",
"react": "^19.2.5",
"react-dom": "^19.2.5",
"tailwindcss": "^4.2.4"
"tailwind-merge": "^3.6.0",
"tailwind-variants": "^3.2.2",
"tailwindcss": "^4.3.0"
}
}
18 changes: 18 additions & 0 deletions src/components/TextExample.astro
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
---
import '../styles/global.css';
---

<div class="display-1">Cherry On Tech (Display-1)</div>
<div class="display-1 font-bold">Cherry On Tech (Display-1)</div>
<div class="display-2">Cherry On Tech (Display-2)</div>
<div class="display-2 font-bold">Cherry On Tech (Display-2)</div>
<div class="display-3">Cherry On Tech (Display-3)</div>
<div class="display-3 font-bold">Cherry On Tech (Display-3)</div>
<h1>Cherry On Tech (H1)</h1>
<h2>Cherry On Tech (H2)</h2>
<h3>Cherry On Tech (H3)</h3>
<h4>Cherry On Tech (H4)</h4>
<h5>Cherry On Tech (H5)</h5>
<body>Cherry On Tech (Body)</body>
<div class="caption">Cherry On Tech (Caption)</div>
<label>Cherry On Tech (Label)</label>
210 changes: 0 additions & 210 deletions src/components/Welcome.astro
View file
Open in desktop

This file was deleted.

7 changes: 2 additions & 5 deletions src/pages/index.astro
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
---
import Welcome from '../components/Welcome.astro';
import Layout from '../layouts/Layout.astro';

// Welcome to Astro! Wondering what to do next? Check out the Astro documentation at https://docs.astro.build
// Don't want to use any of this? Delete everything in this file, the `assets`, `components`, and `layouts` directories, and start fresh.
import TextExample from '../components/TextExample.astro';
---

<Layout>
<Welcome />
<TextExample/>
</Layout>
Loading