Skip to content
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

Theme restructure #2556

Closed
wants to merge 4 commits into from
Closed

Theme restructure #2556

wants to merge 4 commits into from

Conversation

Zo-Bro-23
Copy link
Collaborator

Some themes have names with hyphens, and others have names with underscores. This is slightly confusing, so I thought we'd have names with both hyphens and underscores moving forward. @rickstaa what do you think?

@vercel
Copy link

vercel bot commented Mar 1, 2023

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name Status Preview Updated
github-readme-stats ✅ Ready (Inspect) Visit Preview Mar 1, 2023 at 7:21AM (UTC)

@Zo-Bro-23 Zo-Bro-23 requested a review from rickstaa March 1, 2023 07:19
@github-actions github-actions bot added the themes Feature, Enhancement, Fixes related to themes. label Mar 1, 2023
@rickstaa
Copy link
Collaborator

rickstaa commented Mar 1, 2023

@Zo-Bro-23 I'm okay with this if we make it back-compatible, meaning that we parse themes so that regardless of whether people use a hyphen or underscore, the card works 👍🏻.

@Zo-Bro-23
Copy link
Collaborator Author

Zo-Bro-23 commented Mar 1, 2023

That's what I was trying to do with this PR. Parsing cards with hyphens and underscores works, but as a temporary solution I'm just creating duplicate theme names with hyphens and underscores. What do you think of that? Is it just better to take the time to modify the theme parsing instead of doing this?

@Zo-Bro-23
Copy link
Collaborator Author

#2558 is another way to do this. @rickstaa let me know which one you prefer.

@rickstaa
Copy link
Collaborator

rickstaa commented Mar 1, 2023

#2558 is another way to do this. @rickstaa let me know which one you prefer.

I would love the combination. Making it consistent and back compatible 😄.

@Zo-Bro-23 Zo-Bro-23 closed this Mar 1, 2023
@Zo-Bro-23 Zo-Bro-23 reopened this Mar 1, 2023
@Zo-Bro-23 Zo-Bro-23 closed this Mar 2, 2023
@Zo-Bro-23 Zo-Bro-23 reopened this Mar 2, 2023
@Zo-Bro-23 Zo-Bro-23 closed this Mar 3, 2023
@Zo-Bro-23 Zo-Bro-23 reopened this Mar 3, 2023
@Zo-Bro-23 Zo-Bro-23 closed this Mar 3, 2023
@Zo-Bro-23 Zo-Bro-23 reopened this Mar 3, 2023
Copy link
Collaborator

@rickstaa rickstaa left a comment

Choose a reason for hiding this comment

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

Not Found

@rickstaa rickstaa added the invalid The bug/issue caused by minor mistakes. label Mar 3, 2023
Copy link
Collaborator

@rickstaa rickstaa left a comment

Choose a reason for hiding this comment

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

End of input while parsing an object (missing '}') at line 1,153 >>> "default-repocard": ...

Copy link
Collaborator

@rickstaa rickstaa left a comment

Choose a reason for hiding this comment

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

End of input while parsing an object (missing '}') at line 1,153 >>> "default-repocard": ...

Copy link
Collaborator

@rickstaa rickstaa left a comment

Choose a reason for hiding this comment

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

Something went wrong: Theme JSON file could not be parsed: Error: End of input while parsing an object (missing '}') at line 1,153 >>> "default-repocard": ...

Copy link
Collaborator

@rickstaa rickstaa left a comment

Choose a reason for hiding this comment

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

Something went wrong in the theme preview action: Theme JSON file could not be parsed: End of input while parsing an object (missing '}') at line 1,153 >>> "default-repocard": ...

@Zo-Bro-23 Zo-Bro-23 closed this Mar 3, 2023
@Zo-Bro-23 Zo-Bro-23 reopened this Mar 3, 2023
Copy link
Contributor

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

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

Something went wrong in the theme preview action: Theme JSON file could not be parsed: End of input while parsing an object (missing '}') at line 1,153 >>> "default-repocard": ...

@rickstaa
Copy link
Collaborator

rickstaa commented Mar 3, 2023

@rickstaa the JSON seems to be valid. What do you think?

PS: The error feature is awesome. Thanks for adding it :)

Mm I'm not sure maybe

@rickstaa the JSON seems to be valid. What do you think?

PS: The error feature is awesome. Thanks for adding it :)

Probably my regex not being inclusive enough you changed a lot of things:

parsedJson[0] = "},";
if (!/\s*}\s*,?\s*$/.test(parsedJson[1])) {
parsedJson.push(parsedJson.shift());
} else {
parsedJson.shift();
}
return Hjson.parse(parsedJson.join(""));

@Zo-Bro-23
Copy link
Collaborator Author

@rickstaa the JSON seems to be valid. What do you think?
PS: The error feature is awesome. Thanks for adding it :)

Mm I'm not sure maybe

@rickstaa the JSON seems to be valid. What do you think?
PS: The error feature is awesome. Thanks for adding it :)

Probably my regex not being inclusive enough you changed a lot of things:

parsedJson[0] = "},";
if (!/\s*}\s*,?\s*$/.test(parsedJson[1])) {
parsedJson.push(parsedJson.shift());
} else {
parsedJson.shift();
}
return Hjson.parse(parsedJson.join(""));

Maybe... Can you try making it a bit more lenient?

@rickstaa
Copy link
Collaborator

rickstaa commented Mar 4, 2023

@rickstaa the JSON seems to be valid. What do you think?
PS: The error feature is awesome. Thanks for adding it :)

Mm I'm not sure maybe

@rickstaa the JSON seems to be valid. What do you think?
PS: The error feature is awesome. Thanks for adding it :)

Probably my regex not being inclusive enough you changed a lot of things:

parsedJson[0] = "},";
if (!/\s*}\s*,?\s*$/.test(parsedJson[1])) {
parsedJson.push(parsedJson.shift());
} else {
parsedJson.shift();
}
return Hjson.parse(parsedJson.join(""));

Maybe... Can you try making it a bit more lenient?

@Zo-Bro-23 I currently sadly do not have much time to improve it myself. Feel free to suggest a PR for me to review 👍🏻.

@Zo-Bro-23 Zo-Bro-23 self-assigned this Mar 5, 2023
@Zo-Bro-23 Zo-Bro-23 closed this Mar 5, 2023
@Zo-Bro-23 Zo-Bro-23 reopened this Mar 5, 2023
Copy link
Contributor

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

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

Something went wrong in the theme preview action: Theme JSON file could not be parsed: End of input while parsing an object (missing '}') at line 1,153 >>> "default-repocard": ...

@Zo-Bro-23
Copy link
Collaborator Author

@rickstaa what commit broke the action? Maybe we should revert it to its previous version.

@rickstaa
Copy link
Collaborator

rickstaa commented Mar 5, 2023

@rickstaa what commit broke the action? Maybe we should revert it to its previous version.

No commit broke the action. It is just not equipped yet to handle the mount of changes you made 😅. I will take a quick look.

@rickstaa
Copy link
Collaborator

rickstaa commented Mar 5, 2023

Automated Theme Preview

Hi, thanks for the theme contribution. Please read our theme contribution guidelines.

We are currently only accepting color combinations from any VSCode theme or themes with good colour combinations to minimize bloating the themes collection.

Also, note that if this theme is exclusively for your personal use, then instead of adding it to our theme collection, you can use card customization options.

❌ Theme PR does not adhere to our guidelines.

Test results

  • ❌ default-repocard
  • ❌ gruvbox-light
  • ✔️ vue_dark
  • ❌ shades_of_purple
  • ✔️ blue_green
  • ✔️ great_gatsby
  • ❌ solarized_dark
  • ❌ solarized_light
  • ✔️ chartreuse_dark
  • ✔️ material_palenight
  • ✔️ vision_friendly_dark
  • ✔️ ayu_mirage
  • ❌ midnight_purple
  • ❌ flag_india
  • ❌ kacho-ga
  • ❌ ocean-dark
  • ❌ city-lights
  • ❌ github-dark
  • ❌ discord-old-blurple
  • ❌ aura-dark
  • ❌ noctis-minimus
  • ❌ rose-pine
  • ❌ date-night
  • ❌ one-dark-pro
  • ❌ holi-theme

Result: ❌ Some themes are invalid.

Unfortunately, your theme PR contains an error or does not adhere to our theme guidelines. Please fix the issues below, and we will review your
PR again. This pull request will automatically close in 20 days if no changes are made. After this time, you must re-open the PR for it to be reviewed.

Details

Default-repocard theme preview

  • ⚠️ Theme name isn't in snake_case.
  • ⚠️ title_color does not pass AA contrast ratio.

title_color: #2f80ed | icon_color: #586069 | text_color: #434d58 | bg_color: #fffefe

Preview Link

Gruvbox-light theme preview

title_color: #b57614 | icon_color: #af3a03 | text_color: #427b58 | bg_color: #fbf1c7

Preview Link

Vue_dark theme preview

title_color: #41b883 | icon_color: #41b883 | text_color: #fffefe | bg_color: #273849

Preview Link

Shades_of_purple theme preview

title_color: #fad000 | icon_color: #b362ff | text_color: #a599e9 | bg_color: #2d2b55

Preview Link

Blue_green theme preview

title_color: #2f97c1 | icon_color: #f5b700 | text_color: #0cf574 | bg_color: #040f0f

Preview Link

Great_gatsby theme preview

title_color: #ffa726 | icon_color: #ffb74d | text_color: #ffd95b | bg_color: #000000

Preview Link

Solarized_dark theme preview

title_color: #268bd2 | icon_color: #b58900 | text_color: #859900 | bg_color: #002b36

Preview Link

Solarized_light theme preview

title_color: #268bd2 | icon_color: #b58900 | text_color: #859900 | bg_color: #fdf6e3

Preview Link

Chartreuse_dark theme preview

title_color: #7fff00 | icon_color: #00AEFF | text_color: #fff | bg_color: #000

Preview Link

Material_palenight theme preview

title_color: #c792ea | icon_color: #89ddff | text_color: #a6accd | bg_color: #292d3e

Preview Link

Vision_friendly_dark theme preview

title_color: #ffb000 | icon_color: #785ef0 | text_color: #ffffff | bg_color: #000000

Preview Link

Ayu_mirage theme preview

title_color: #f4cd7c | icon_color: #73d0ff | text_color: #c7c8c2 | bg_color: #1f2430

Preview Link

Midnight_purple theme preview

title_color: #9745f5 | icon_color: #9f4bff | text_color: #ffffff | bg_color: #000000

Preview Link

Flag_india theme preview

title_color: #ff8f1c | icon_color: #250E62 | text_color: #509E2F | bg_color: #ffffff

Preview Link

Kacho-ga theme preview

title_color: #bf4a3f | icon_color: #a64833 | text_color: #d9c8a9 | bg_color: #402b23

Preview Link

Ocean-dark theme preview

  • ⚠️ Theme name isn't in snake_case.
  • ⚠️ title_color does not pass AA contrast ratio.

title_color: #8957B2 | icon_color: #FFFFFF | text_color: #92D534 | bg_color: #151A28

Preview Link

City-lights theme preview

title_color: #5D8CB3 | icon_color: #4798FF | text_color: #718CA1 | bg_color: #1D252C

Preview Link

Github-dark theme preview

  • ⚠️ Theme name isn't in snake_case.
  • ⚠️ icon_color does not pass AA contrast ratio.

title_color: #58A6FF | icon_color: #1F6FEB | text_color: #C3D1D9 | bg_color: #0D1117

Preview Link

Discord-old-blurple theme preview

title_color: #7289DA | icon_color: #7289DA | text_color: #FFFFFF | bg_color: #2C2F33

Preview Link

Aura-dark theme preview

  • ⚠️ Theme name isn't in snake_case.

title_color: #ff7372 | icon_color: #6cffd0 | text_color: #dbdbdb | bg_color: #252334

Preview Link

Noctis-minimus theme preview

  • ⚠️ Theme name isn't in snake_case.

title_color: #d3b692 | icon_color: #72b7c0 | text_color: #c5cdd3 | bg_color: #1b2932

Preview Link

Rose-pine theme preview

  • ⚠️ Theme name isn't in snake_case.

title_color: #9ccfd8 | icon_color: #ebbcba | text_color: #e0def4 | bg_color: #191724

Preview Link

Date-night theme preview

  • ⚠️ Theme name isn't in snake_case.

title_color: #DA7885 | icon_color: #BB8470 | text_color: #E1B2A2 | bg_color: #170F0C | border_color: #170F0C

Preview Link

One-dark-pro theme preview

  • ⚠️ Theme name isn't in snake_case.

title_color: #61AFEF | icon_color: #C678DD | text_color: #E5C06E | bg_color: #23272E | border_color: #3B4048

Preview Link

Holi-theme theme preview

  • ⚠️ Theme name isn't in snake_case.

title_color: #5FABEE | icon_color: #5FABEE | text_color: #D6E7FF | bg_color: #030314 | border_color: #85A4C0

Preview Link

Copy link
Collaborator

@rickstaa rickstaa left a comment

Choose a reason for hiding this comment

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

Some themes are invalid. See the Automated Theme Preview comment above for more information.

@Zo-Bro-23
Copy link
Collaborator Author

The snake case feature is nice! How does the AA ratio work out though? I didn't add any new themes; these are all existing ones.

@rickstaa
Copy link
Collaborator

rickstaa commented Mar 6, 2023

The snake case feature is nice! How does the AA ratio work out, though? I didn't add any new themes; these are all existing ones.

Yea, the snake case was added for the same reason you wanted to restructure the themes in the first place. Maybe, therefore, the solution where hyphens get replaced with underscores is the best one 🤔? The AA ratio errors are from the fact that these themes have been around a long time and were therefore added before we had the AA tests. Nobody has yet taken the time to make them more AA-compatible 😅.

@github-actions
Copy link
Contributor

This theme PR has been automatically closed due to inactivity. Please reopen it if you want to continue working on it.
Thank you for your contributions.

@github-actions github-actions bot closed this Mar 29, 2023
@rickstaa rickstaa reopened this Mar 29, 2023
@github-actions
Copy link
Contributor

github-actions bot commented Mar 29, 2023

Automated Theme Preview

Hi, thanks for the theme contribution. Please read our theme contribution guidelines.

We are currently only accepting color combinations from any VSCode theme or themes with good color combinations to minimize bloating the themes collection.

Also, note that if this theme is exclusively for your personal use, then instead of adding it to our theme collection, you can use card customization options.

❌ Theme PR does not adhere to our guidelines.

Test results

  • ❌ default-repocard
  • ❌ gruvbox-light
  • ✔️ vue_dark
  • ❌ shades_of_purple
  • ✔️ blue_green
  • ✔️ great_gatsby
  • ❌ solarized_dark
  • ❌ solarized_light
  • ✔️ chartreuse_dark
  • ✔️ material_palenight
  • ✔️ vision_friendly_dark
  • ✔️ ayu_mirage
  • ❌ midnight_purple
  • ❌ flag_india
  • ❌ kacho-ga
  • ❌ ocean-dark
  • ❌ city-lights
  • ❌ github-dark
  • ❌ discord-old-blurple
  • ❌ aura-dark
  • ❌ noctis-minimus
  • ❌ rose-pine
  • ❌ date-night
  • ❌ one-dark-pro
  • ❌ holi-theme

Result: ❌ Some themes are invalid.

Unfortunately, your theme PR contains an error or does not adhere to our theme guidelines. Please fix the issues below, and we will review your
PR again. This pull request will automatically close in 20 days if no changes are made. After this time, you must re-open the PR for it to be reviewed.

Details

Default-repocard theme preview

  • ⚠️ Theme name isn't in snake_case.
  • ⚠️ title_color does not pass AA contrast ratio.

title_color: #2f80ed | icon_color: #586069 | text_color: #434d58 | bg_color: #fffefe

Preview Link

Gruvbox-light theme preview

title_color: #b57614 | icon_color: #af3a03 | text_color: #427b58 | bg_color: #fbf1c7

Preview Link

Vue_dark theme preview

title_color: #41b883 | icon_color: #41b883 | text_color: #fffefe | bg_color: #273849

Preview Link

Shades_of_purple theme preview

title_color: #fad000 | icon_color: #b362ff | text_color: #a599e9 | bg_color: #2d2b55

Preview Link

Blue_green theme preview

title_color: #2f97c1 | icon_color: #f5b700 | text_color: #0cf574 | bg_color: #040f0f

Preview Link

Great_gatsby theme preview

title_color: #ffa726 | icon_color: #ffb74d | text_color: #ffd95b | bg_color: #000000

Preview Link

Solarized_dark theme preview

title_color: #268bd2 | icon_color: #b58900 | text_color: #859900 | bg_color: #002b36

Preview Link

Solarized_light theme preview

title_color: #268bd2 | icon_color: #b58900 | text_color: #859900 | bg_color: #fdf6e3

Preview Link

Chartreuse_dark theme preview

title_color: #7fff00 | icon_color: #00AEFF | text_color: #fff | bg_color: #000

Preview Link

Material_palenight theme preview

title_color: #c792ea | icon_color: #89ddff | text_color: #a6accd | bg_color: #292d3e

Preview Link

Vision_friendly_dark theme preview

title_color: #ffb000 | icon_color: #785ef0 | text_color: #ffffff | bg_color: #000000

Preview Link

Ayu_mirage theme preview

title_color: #f4cd7c | icon_color: #73d0ff | text_color: #c7c8c2 | bg_color: #1f2430

Preview Link

Midnight_purple theme preview

title_color: #9745f5 | icon_color: #9f4bff | text_color: #ffffff | bg_color: #000000

Preview Link

Flag_india theme preview

title_color: #ff8f1c | icon_color: #250E62 | text_color: #509E2F | bg_color: #ffffff

Preview Link

Kacho-ga theme preview

title_color: #bf4a3f | icon_color: #a64833 | text_color: #d9c8a9 | bg_color: #402b23

Preview Link

Ocean-dark theme preview

  • ⚠️ Theme name isn't in snake_case.
  • ⚠️ title_color does not pass AA contrast ratio.

title_color: #8957B2 | icon_color: #FFFFFF | text_color: #92D534 | bg_color: #151A28

Preview Link

City-lights theme preview

title_color: #5D8CB3 | icon_color: #4798FF | text_color: #718CA1 | bg_color: #1D252C

Preview Link

Github-dark theme preview

  • ⚠️ Theme name isn't in snake_case.
  • ⚠️ icon_color does not pass AA contrast ratio.

title_color: #58A6FF | icon_color: #1F6FEB | text_color: #C3D1D9 | bg_color: #0D1117

Preview Link

Discord-old-blurple theme preview

title_color: #7289DA | icon_color: #7289DA | text_color: #FFFFFF | bg_color: #2C2F33

Preview Link

Aura-dark theme preview

  • ⚠️ Theme name isn't in snake_case.

title_color: #ff7372 | icon_color: #6cffd0 | text_color: #dbdbdb | bg_color: #252334

Preview Link

Noctis-minimus theme preview

  • ⚠️ Theme name isn't in snake_case.

title_color: #d3b692 | icon_color: #72b7c0 | text_color: #c5cdd3 | bg_color: #1b2932

Preview Link

Rose-pine theme preview

  • ⚠️ Theme name isn't in snake_case.

title_color: #9ccfd8 | icon_color: #ebbcba | text_color: #e0def4 | bg_color: #191724

Preview Link

Date-night theme preview

  • ⚠️ Theme name isn't in snake_case.

title_color: #DA7885 | icon_color: #BB8470 | text_color: #E1B2A2 | bg_color: #170F0C | border_color: #170F0C

Preview Link

One-dark-pro theme preview

  • ⚠️ Theme name isn't in snake_case.

title_color: #61AFEF | icon_color: #C678DD | text_color: #E5C06E | bg_color: #23272E | border_color: #3B4048

Preview Link

Holi-theme theme preview

  • ⚠️ Theme name isn't in snake_case.

title_color: #5FABEE | icon_color: #5FABEE | text_color: #D6E7FF | bg_color: #030314 | border_color: #85A4C0

Preview Link

Copy link
Contributor

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

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

Some themes are invalid. See the Automated Theme Preview comment above for more information.

@github-actions
Copy link
Contributor

This theme PR has been automatically closed due to inactivity. Please reopen it if you want to continue working on it.
Thank you for your contributions.

@github-actions github-actions bot closed this Apr 22, 2023
@rickstaa rickstaa reopened this Apr 22, 2023
Copy link
Contributor

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

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

Some themes are invalid. See the Automated Theme Preview comment above for more information.

@github-actions
Copy link
Contributor

This theme PR has been automatically closed due to inactivity. Please reopen it if you want to continue working on it.
Thank you for your contributions.

@github-actions github-actions bot closed this May 15, 2023
@rickstaa rickstaa reopened this May 15, 2023
Copy link
Contributor

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

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

Some themes are invalid. See the Automated Theme Preview comment above for more information.

@rickstaa
Copy link
Collaborator

@Zo-Bro-23 I reopened this since it actually makes sent. I, however, would just rename the themes with hyphens to underscores. Although this will break the theme for some people, it will just fall back to the default theme, which is, in my opinion, better than adding two versions of a theme.

@github-actions
Copy link
Contributor

github-actions bot commented Jun 8, 2023

This theme PR has been automatically closed due to inactivity. Please reopen it if you want to continue working on it.
Thank you for your contributions.

@github-actions github-actions bot closed this Jun 8, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
invalid The bug/issue caused by minor mistakes. themes Feature, Enhancement, Fixes related to themes.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants