Skip to content

Combine site and spec #276

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.

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

Merged
merged 62 commits into from
Jul 15, 2025
Merged

Combine site and spec #276

merged 62 commits into from
Jul 15, 2025

Conversation

drwpow
Copy link
Contributor

@drwpow drwpow commented Jun 19, 2025

Warning

This should NOT be squashed! We should merge all commits to preserve history

Changes

Imports the https://github.com/design-tokens/designtokens.org repo locally, saving all the Git history & commits too. For the purpose of combining into one website, one URL

Screenshots

CleanShot 2025-06-18 at 23 12 12@2x

CleanShot 2025-06-18 at 23 12 03@2x

CleanShot 2025-06-18 at 23 11 48@2x

CleanShot 2025-06-18 at 23 11 56@2x

Repo changes

  • Uses pnpm because it’s the preferred way of dealing with monorepos
  • Imports git history from https://github.com/design-tokens/designtokens.org so no attribution/context is lost
  • Adds new URLs (everything else is the same):
    • /TR/preview/: in-progress draft (is there a better name than “preview?”)
    • /TR/first-editors-draft: first editors draft
    • /TR/second-editors-draft: second editors draft
  • Only adds minor Prettier formatting, but nothing major (only cleans up inconsistencies, doesn’t change the style of anything)

Everything else is the same—same version of Eleventy, same site build, etc. etc.

Todo

After this PR merges, there will likely be some Netlify cleanup (if any can’t happen in this PR).

kaelig and others added 30 commits February 3, 2021 16:24
…ols-listing

update glossary Design Tools listing for inclusivity
* Add Press Kit page

* Update press-kit.md

Adding more content to the Press Kit. I'll be working on the long description and will add it once done.

* Update press-kit.md

Adding URLs for Donna (me) and Kathleen

* Update press-kit.md

Updated Jina and Matt Felten

* Update press-kit.md

Removed Zack

* Update press-kit.md

Added the long-form description. But could really use a writer/editor!

* Various URL updates

* Add link to logo

* Delete redundant title

* Update press-kit.md

Minor edit to correct title format.

* Github -> GitHub

Co-authored-by: Donna Vitan <[email protected]>
Copy link

netlify bot commented Jun 19, 2025

Deploy Preview for dtcg-tr ready!

Name Link
🔨 Latest commit 3898009
🔍 Latest deploy log https://app.netlify.com/projects/dtcg-tr/deploys/68766caee59d5000086b0dec
😎 Deploy Preview https://deploy-preview-276--dtcg-tr.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify project configuration.

@drwpow drwpow requested a review from kaelig June 19, 2025 05:18
@@ -0,0 +1,463 @@
<!DOCTYPE html><html lang="en"><head>
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I know that hard-committing previous editors drafts straight into the repo is a little dumb. But may also be good? These are evergreen, version-controlled, and never have to be regenerated. These are true “snapshots” in every sense.

There’s probably a better way to do this, I just couldn’t think of one (especially if we want to preserve the original respec version and all)

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is totally fine! That's what I did for the first and second draft snapshots.

@drwpow drwpow force-pushed the combine branch 3 times, most recently from 2e6e1fe to 9831e47 Compare June 19, 2025 05:29
@kaelig kaelig changed the title Combine Combine site and spec Jul 1, 2025
Copy link

netlify bot commented Jul 1, 2025

Deploy Preview for sweet-taiyaki-f0adbd ready!

Name Link
🔨 Latest commit 3898009
🔍 Latest deploy log https://app.netlify.com/projects/sweet-taiyaki-f0adbd/deploys/68766cae5d618e00087a2209
😎 Deploy Preview https://deploy-preview-276--sweet-taiyaki-f0adbd.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify project configuration.

@kaelig kaelig merged commit c8ab746 into main Jul 15, 2025
6 checks passed
@kaelig kaelig deleted the combine branch July 15, 2025 15:00
github-actions bot added a commit that referenced this pull request Jul 15, 2025
SHA: c8ab746
Reason: push, by kaelig

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants