diff --git a/ASSETS.md b/ASSETS.md index 2411166da4..1e480f5602 100644 --- a/ASSETS.md +++ b/ASSETS.md @@ -57,7 +57,7 @@ rather not buy one. This section covers every file at the top level of `assets/icons/` **except** those named elsewhere in this document — specifically `logomark.svg`, `newskie.svg`, `verifiedCheck.svg`, -`verifierCheck.svg`, `starterPack.svg`, `starter_pack_icon.svg`, `custom_logo_japan.svg`, +`verifierCheck.svg`, `starterPack.svg`, `starterPack_stroke2_corner0_rounded.svg`, `custom_logo_japan.svg`, `apple_logo.svg`, and `android_logo.svg`. The `assets/icons/flags/` and `assets/icons/community/` subdirectories are covered by [Section 6](#6-third-party-assets-you-may-redistribute) and [Section 5](#5-third-party-trademarks) respectively. @@ -89,7 +89,7 @@ supports it. - `assets/icons/newskie.svg` - `assets/icons/verifiedCheck.svg` - `assets/icons/verifierCheck.svg` -- `assets/icons/starterPack.svg`, `assets/icons/starter_pack_icon.svg` +- `assets/icons/starterPack.svg`, `assets/icons/starterPack_stroke2_corner0_rounded.svg` - `bskyembed/assets/logo.svg` - `bskyembed/assets/logo_full_name.svg` - `bskyweb/static/favicon.png`, `favicon-16x16.png`, `favicon-32x32.png` diff --git a/assets/icons/README.md b/assets/icons/README.md index 66c034bd1b..c249d68d45 100644 --- a/assets/icons/README.md +++ b/assets/icons/README.md @@ -13,7 +13,7 @@ This notice covers the SVG files at the top level of this directory. It does not - `flags/` — country-flag-icons, MIT licensed, see [`flags/README.md`](./flags/README.md) - `community/` — third-party service marks, see [`community/README.md`](./community/README.md) - `logomark.svg`, `newskie.svg`, `verifiedCheck.svg`, `verifierCheck.svg`, `starterPack.svg`, - `starter_pack_icon.svg` — Bluesky trademarks and brand assets + `starterPack_stroke2_corner0_rounded.svg` — Bluesky trademarks and brand assets - `custom_logo_japan.svg` — artwork by a Bluesky Japan logo contest entrant - `apple_logo.svg`, `android_logo.svg` — Apple and Google trademarks diff --git a/assets/icons/starterPack_stroke2_corner0_rounded.svg b/assets/icons/starterPack_stroke2_corner0_rounded.svg new file mode 100644 index 0000000000..2c4ee61c59 --- /dev/null +++ b/assets/icons/starterPack_stroke2_corner0_rounded.svg @@ -0,0 +1 @@ + diff --git a/assets/icons/starter_pack_icon.svg b/assets/icons/starter_pack_icon.svg deleted file mode 100644 index 3022e989a1..0000000000 --- a/assets/icons/starter_pack_icon.svg +++ /dev/null @@ -1 +0,0 @@ - diff --git a/src/components/StarterPack/StarterPackCard.tsx b/src/components/StarterPack/StarterPackCard.tsx index 2ddfe642a9..97c5c6fe82 100644 --- a/src/components/StarterPack/StarterPackCard.tsx +++ b/src/components/StarterPack/StarterPackCard.tsx @@ -13,7 +13,7 @@ import {precacheResolvedUri} from '#/state/queries/resolve-uri' import {precacheStarterPack} from '#/state/queries/starter-packs' import {useSession} from '#/state/session' import {atoms as a, useTheme} from '#/alf' -import {StarterPack as StarterPackIcon} from '#/components/icons/StarterPack' +import {StarterPackMultiPathLarge as StarterPackIcon} from '#/components/icons/StarterPack' import { Link as BaseLink, type LinkProps as BaseLinkProps, diff --git a/src/components/dialogs/StarterPackDialog.tsx b/src/components/dialogs/StarterPackDialog.tsx index 2a77292f42..ac1cb6aaef 100644 --- a/src/components/dialogs/StarterPackDialog.tsx +++ b/src/components/dialogs/StarterPackDialog.tsx @@ -26,7 +26,7 @@ import {Button, ButtonIcon, ButtonText} from '#/components/Button' import * as Dialog from '#/components/Dialog' import {Divider} from '#/components/Divider' import {PlusLarge_Stroke2_Corner0_Rounded as PlusIcon} from '#/components/icons/Plus' -import {StarterPack} from '#/components/icons/StarterPack' +import {StarterPackMultiPathLarge as StarterPackIcon} from '#/components/icons/StarterPack' import {TimesLarge_Stroke2_Corner0_Rounded as XIcon} from '#/components/icons/Times' import {Loader} from '#/components/Loader' import * as Toast from '#/components/Toast' @@ -94,7 +94,7 @@ function Empty({onStartWizard}: {onStartWizard: () => void}) { return ( - diff --git a/src/components/icons/StarterPack.tsx b/src/components/icons/StarterPack.tsx index 8c678bca47..9840e282c7 100644 --- a/src/components/icons/StarterPack.tsx +++ b/src/components/icons/StarterPack.tsx @@ -1,8 +1,17 @@ -import {createMultiPathSVG} from './TEMPLATE' +import {createMultiPathSVG, createSinglePathSVG} from './TEMPLATE' -export const StarterPack = createMultiPathSVG({ +/** + * Special icon for large display. Use with `gradient="sky"` + * + * If trying to slot into other components (e.g. as a Menu.Item) use StarterPack_Stroke2_Corner0_Rounded instead + */ +export const StarterPackMultiPathLarge = createMultiPathSVG({ paths: [ 'M11.26 5.227 5.02 6.899c-.734.197-1.17.95-.973 1.685l1.672 6.24c.197.734.951 1.17 1.685.973l6.24-1.672c.734-.197 1.17-.951.973-1.685L12.945 6.2a1.375 1.375 0 0 0-1.685-.973Zm-6.566.459a2.632 2.632 0 0 0-1.86 3.223l1.672 6.24a2.632 2.632 0 0 0 3.223 1.861l6.24-1.672a2.631 2.631 0 0 0 1.861-3.223l-1.672-6.24a2.632 2.632 0 0 0-3.223-1.861l-6.24 1.672Z', 'M15.138 18.411a4.606 4.606 0 1 0 0-9.211 4.606 4.606 0 0 0 0 9.211Zm0 1.257a5.862 5.862 0 1 0 0-11.724 5.862 5.862 0 0 0 0 11.724Z', ], }) + +export const StarterPack_Stroke2_Corner0_Rounded = createSinglePathSVG({ + path: 'M10.775 2.74a3 3 0 0 1 3.524 2.158l.57 2.13a7.5 7.5 0 1 1-6.12 10.744l-2.228.598-.15.036a3 3 0 0 1-3.48-2.009l-.044-.148L.777 8.52a3 3 0 0 1 1.973-3.63l.148-.044 7.728-2.07.149-.037Zm4.624 6.262.97 3.624.037.149a3 3 0 0 1-2.009 3.48l-.148.044-3.517.942A5.5 5.5 0 1 0 15.5 9l-.101.002Zm-3.031-3.586a1 1 0 0 0-1.225-.707l-7.727 2.07a1 1 0 0 0-.707 1.225l2.07 7.727a1 1 0 0 0 1.225.707l2.123-.57a7.504 7.504 0 0 1 4.788-8.412l-.547-2.04ZM13.435 9.4a5.5 5.5 0 0 0-3.37 5.948l3.666-.981a1 1 0 0 0 .707-1.225l-1.003-3.742Z', +}) diff --git a/src/screens/Search/Explore.tsx b/src/screens/Search/Explore.tsx index 364b7cbca2..4540da35a7 100644 --- a/src/screens/Search/Explore.tsx +++ b/src/screens/Search/Explore.tsx @@ -59,7 +59,7 @@ import { type Props as SVGIconProps, } from '#/components/icons/common' import {ListSparkle_Stroke2_Corner0_Rounded as ListSparkle} from '#/components/icons/ListSparkle' -import {StarterPack} from '#/components/icons/StarterPack' +import {StarterPackMultiPathLarge as StarterPackIcon} from '#/components/icons/StarterPack' import {UserCircle_Stroke2_Corner0_Rounded as Person} from '#/components/icons/UserCircle' import {boostInterests} from '#/components/InterestTabs' import {Loader} from '#/components/Loader' @@ -659,7 +659,7 @@ export function Explore({ type: 'header', key: 'suggested-starterPacks-header', title: l`Starter Packs`, - icon: StarterPack, + icon: StarterPackIcon, iconSize: 'md', }) diff --git a/src/screens/StarterPack/Wizard/StepDetails.tsx b/src/screens/StarterPack/Wizard/StepDetails.tsx index 5a7770f2f0..5c29e115dd 100644 --- a/src/screens/StarterPack/Wizard/StepDetails.tsx +++ b/src/screens/StarterPack/Wizard/StepDetails.tsx @@ -8,7 +8,7 @@ import {useSession} from '#/state/session' import {useWizardState} from '#/screens/StarterPack/Wizard/State' import {atoms as a, useTheme} from '#/alf' import * as TextField from '#/components/forms/TextField' -import {StarterPack} from '#/components/icons/StarterPack' +import {StarterPackMultiPathLarge as StarterPackIcon} from '#/components/icons/StarterPack' import {ScreenTransition} from '#/components/ScreenTransition' import {Text} from '#/components/Typography' @@ -29,7 +29,7 @@ export function StepDetails() { - + Invites, but personal diff --git a/src/view/com/notifications/NotificationFeedItem.tsx b/src/view/com/notifications/NotificationFeedItem.tsx index c8efc82678..c11cb8049b 100644 --- a/src/view/com/notifications/NotificationFeedItem.tsx +++ b/src/view/com/notifications/NotificationFeedItem.tsx @@ -57,7 +57,7 @@ import {Heart2_Filled_Stroke2_Corner0_Rounded as HeartIconFilled} from '#/compon import {PersonPlus_Filled_Stroke2_Corner0_Rounded as PersonPlusIcon} from '#/components/icons/Person' import {PlusLarge_Stroke2_Corner0_Rounded as PlusIcon} from '#/components/icons/Plus' import {Repost_Stroke2_Corner3_Rounded as RepostIcon} from '#/components/icons/Repost' -import {StarterPack} from '#/components/icons/StarterPack' +import {StarterPackMultiPathLarge as StarterPackIcon} from '#/components/icons/StarterPack' import {VerifiedCheck} from '#/components/icons/VerifiedCheck' import {InlineLinkText, Link} from '#/components/Link' import * as MediaPreview from '#/components/MediaPreview' @@ -434,7 +434,7 @@ let NotificationFeedItem = ({ ) icon = ( - + ) } else if (item.type === 'verified') { @@ -745,7 +745,7 @@ function FollowedViaStarterPack({ via starter pack{' '} - {avatarType === 'starter-pack' ? ( - + ) : ( )}