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.

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

Jump to bottom

Future-proof website for guidelines object format. #316

Merged
merged 10 commits into from
Jan 10, 2024
Merged

Future-proof website for guidelines object format. #316

Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
f1b7b51
Future-proof website for guidelines object format.
Dec 6, 2023
918fb42
Merge branch 'master' of https://github.com/adamrusted/simple-icons-w…
Dec 6, 2023
8406cf3
Prioritise Trademark
Dec 18, 2023
f7bff0f
Merge branch 'master' into master
Dec 18, 2023
d123ffd
Apply suggestions from code review
Dec 21, 2023
f8230f3
Fix Formatting
Dec 21, 2023
29c0354
Fix indentation
PeterShaggyNoble Dec 21, 2023
8917e12
Merge branch 'master' into master
Dec 21, 2023
6a40427
Merge remote-tracking branch 'upstream/master'
Dec 31, 2023
66f366b
Merge branch 'master' into master
Jan 10, 2024
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
7 changes: 6 additions & 1 deletion webpack.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,12 @@ export default async (env, argv) => {
const plainAliases = getIconPlainAliases(iconsDataBySlugs[icon.slug]);

return {
guidelines: icon.guidelines,
guidelines:
typeof icon.guidelines !== 'object'
? icon.guidelines
: icon.guidelines.trademark
? icon.guidelines.trademark
: icon.guidelines.branding,
hex: icon.hex,
indexByAlpha: iconIndex,
indexByColor: sortedHexes.indexOf(icon.hex),
Expand Down