Tweak colors
This commit is contained in:
@@ -126,5 +126,6 @@ export const gradients = {
|
|||||||
|
|
||||||
export const blueskyPlus = {
|
export const blueskyPlus = {
|
||||||
dark: '#083367',
|
dark: '#083367',
|
||||||
|
mid: '#67A59F',
|
||||||
light: '#9EE8C1',
|
light: '#9EE8C1',
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -29,10 +29,11 @@ import {GradientFill} from '#/components/GradientFill'
|
|||||||
import {AndroidLogo} from '#/components/icons/AndroidLogo'
|
import {AndroidLogo} from '#/components/icons/AndroidLogo'
|
||||||
import {AppleLogo} from '#/components/icons/AppleLogo'
|
import {AppleLogo} from '#/components/icons/AppleLogo'
|
||||||
import {ArrowRotateCounterClockwise_Stroke2_Corner0_Rounded as Rotate} from '#/components/icons/ArrowRotateCounterClockwise'
|
import {ArrowRotateCounterClockwise_Stroke2_Corner0_Rounded as Rotate} from '#/components/icons/ArrowRotateCounterClockwise'
|
||||||
import {Full as BlueskyPlusLogo} from '#/components/icons/BlueskyPlus'
|
import {Logotype} from '#/components/icons/BlueskyPlus'
|
||||||
import {CheckThick_Stroke2_Corner0_Rounded as Check} from '#/components/icons/Check'
|
import {CheckThick_Stroke2_Corner0_Rounded as Check} from '#/components/icons/Check'
|
||||||
import {Clock_Stroke2_Corner0_Rounded as Clock} from '#/components/icons/Clock'
|
import {Clock_Stroke2_Corner0_Rounded as Clock} from '#/components/icons/Clock'
|
||||||
import {Globe_Stroke2_Corner0_Rounded as Globe} from '#/components/icons/Globe'
|
import {Globe_Stroke2_Corner0_Rounded as Globe} from '#/components/icons/Globe'
|
||||||
|
import {Mark} from '#/components/icons/Logo'
|
||||||
import {PlusLarge_Stroke2_Corner0_Rounded as Plus} from '#/components/icons/Plus'
|
import {PlusLarge_Stroke2_Corner0_Rounded as Plus} from '#/components/icons/Plus'
|
||||||
import * as Layout from '#/components/Layout'
|
import * as Layout from '#/components/Layout'
|
||||||
import {createStaticClick, Link} from '#/components/Link'
|
import {createStaticClick, Link} from '#/components/Link'
|
||||||
@@ -77,6 +78,7 @@ function Core({
|
|||||||
state: Exclude<PurchasesState, {status: 'loading' | 'error'}>
|
state: Exclude<PurchasesState, {status: 'loading' | 'error'}>
|
||||||
restricted: NativePurchaseRestricted
|
restricted: NativePurchaseRestricted
|
||||||
}) {
|
}) {
|
||||||
|
const t = useTheme()
|
||||||
const coreSubscriptions = state.subscriptions
|
const coreSubscriptions = state.subscriptions
|
||||||
.filter(s => s.group === SubscriptionGroupId.Core)
|
.filter(s => s.group === SubscriptionGroupId.Core)
|
||||||
.filter(s => {
|
.filter(s => {
|
||||||
@@ -86,7 +88,10 @@ function Core({
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<View>
|
<View>
|
||||||
<BlueskyPlusLogo width={130} gradient="midnight" />
|
<View style={[a.flex_row, a.align_center, a.gap_xs]}>
|
||||||
|
<Mark width={26} gradient="nordic" />
|
||||||
|
<Logotype width={80} fill={t.atoms.text_contrast_medium.color} />
|
||||||
|
</View>
|
||||||
|
|
||||||
{restricted === 'yes' ? (
|
{restricted === 'yes' ? (
|
||||||
<Admonition type="info">
|
<Admonition type="info">
|
||||||
@@ -100,7 +105,10 @@ function Core({
|
|||||||
)}
|
)}
|
||||||
|
|
||||||
{isSubscribedToCore ? (
|
{isSubscribedToCore ? (
|
||||||
<View style={[a.gap_sm]}>
|
<View style={[a.gap_sm, a.pt_lg]}>
|
||||||
|
<Text style={[a.text_sm, a.font_bold, t.atoms.text_contrast_medium]}>
|
||||||
|
<Trans>Active subscriptions</Trans>
|
||||||
|
</Text>
|
||||||
{coreSubscriptions.map(sub => (
|
{coreSubscriptions.map(sub => (
|
||||||
<Subscription key={sub.purchasedAt} subscription={sub} />
|
<Subscription key={sub.purchasedAt} subscription={sub} />
|
||||||
))}
|
))}
|
||||||
@@ -160,32 +168,18 @@ function Purchase() {
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
<BlueskyPlusLogo width={130} gradient="nordic" />
|
|
||||||
|
|
||||||
<Text style={[a.text_3xl, a.font_heavy, a.pt_md, a.pb_xs]}>
|
<Text style={[a.text_3xl, a.font_heavy, a.pt_md, a.pb_xs]}>
|
||||||
<Trans>Building a better internet needs your support.</Trans>
|
<Trans>Building a better internet needs your support.</Trans>
|
||||||
</Text>
|
</Text>
|
||||||
|
|
||||||
<View style={[a.gap_xs]}>
|
<View style={[a.gap_xs]}>
|
||||||
<Text
|
<Text style={[a.text_md, a.leading_snug, a.pt_xs]}>
|
||||||
style={[
|
|
||||||
a.text_md,
|
|
||||||
a.leading_snug,
|
|
||||||
a.pt_xs,
|
|
||||||
t.atoms.text_contrast_medium,
|
|
||||||
]}>
|
|
||||||
<Trans>
|
<Trans>
|
||||||
Subscribing to Bluesky+ helps ensure that our work to build an open,
|
Subscribing to Bluesky+ helps ensure that our work to build an open,
|
||||||
secure, and user-first internet can continue.
|
secure, and user-first internet can continue.
|
||||||
</Trans>
|
</Trans>
|
||||||
</Text>
|
</Text>
|
||||||
<Text
|
<Text style={[a.text_md, a.leading_snug, a.pt_xs]}>
|
||||||
style={[
|
|
||||||
a.text_md,
|
|
||||||
a.leading_snug,
|
|
||||||
a.pt_xs,
|
|
||||||
t.atoms.text_contrast_medium,
|
|
||||||
]}>
|
|
||||||
<Trans>Plus, you'll get access to exclusive features!</Trans>
|
<Trans>Plus, you'll get access to exclusive features!</Trans>
|
||||||
</Text>
|
</Text>
|
||||||
</View>
|
</View>
|
||||||
@@ -196,15 +190,16 @@ function Purchase() {
|
|||||||
a.p_lg,
|
a.p_lg,
|
||||||
a.gap_sm,
|
a.gap_sm,
|
||||||
a.rounded_sm,
|
a.rounded_sm,
|
||||||
t.atoms.bg_contrast_25,
|
a.border,
|
||||||
|
t.atoms.border_contrast_low,
|
||||||
]}>
|
]}>
|
||||||
{features.map(f => (
|
{features.map(f => (
|
||||||
<View key={f.text} style={[a.flex_row, a.gap_md]}>
|
<View key={f.text} style={[a.flex_row, a.gap_sm]}>
|
||||||
<View style={{paddingTop: 2}}>
|
<View style={{paddingTop: 2}}>
|
||||||
<f.icon
|
<f.icon
|
||||||
fill={
|
fill={
|
||||||
f.available
|
f.available
|
||||||
? t.palette.primary_500
|
? tokens.blueskyPlus.mid
|
||||||
: t.atoms.text_contrast_low.color
|
: t.atoms.text_contrast_low.color
|
||||||
}
|
}
|
||||||
size="sm"
|
size="sm"
|
||||||
@@ -230,10 +225,10 @@ function Purchase() {
|
|||||||
color="primary"
|
color="primary"
|
||||||
style={[a.overflow_hidden]}>
|
style={[a.overflow_hidden]}>
|
||||||
<GradientFill gradient={tokens.gradients.nordic} />
|
<GradientFill gradient={tokens.gradients.nordic} />
|
||||||
<ButtonText style={[t.atoms.text]}>
|
<ButtonText style={[{color: 'white'}]}>
|
||||||
<Trans>Subscribe</Trans>
|
<Trans>Subscribe</Trans>
|
||||||
</ButtonText>
|
</ButtonText>
|
||||||
<ButtonIcon icon={Plus} position="right" style={[t.atoms.text]} />
|
<ButtonIcon icon={Plus} position="right" style={[{color: 'white'}]} />
|
||||||
</Button>
|
</Button>
|
||||||
<BlueskyPlus control={control} />
|
<BlueskyPlus control={control} />
|
||||||
</>
|
</>
|
||||||
|
|||||||
Reference in New Issue
Block a user