rmorawski/standardnotes-app-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: handle removed grey-x colors from stylekit (#1046)

Browse Source
This commit is contained in:
Mo
2022-05-23 18:09:30 -05:00
committed by GitHub
parent 4e621cadde
commit c6839f776a
35 changed files with 62 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/javascripts/Components/PurchaseFlow/Panes/CreateAccount.tsx
View File

@@ -140,7 +140,7 @@ export const CreateAccount: FunctionComponent<Props> = observer(({ appState, app
disabled={isCreatingAccount}
isInvalid={isEmailInvalid}
/>
{isEmailInvalid ? <div className="color-dark-red mb-4">Please provide a valid email.</div> : null}
{isEmailInvalid ? <div className="color-danger mb-4">Please provide a valid email.</div> : null}
<FloatingLabelInput
className="min-w-90 xs:min-w-auto mb-4"
id="purchase-create-account-password"
@@ -163,7 +163,7 @@ export const CreateAccount: FunctionComponent<Props> = observer(({ appState, app
isInvalid={isPasswordNotMatching}
/>
{isPasswordNotMatching ? (
<div className="color-dark-red mb-4">Passwords don't match. Please try again.</div>
<div className="color-danger mb-4">Passwords don't match. Please try again.</div>
) : null}
</div>
</form>

6
app/assets/javascripts/Components/PurchaseFlow/Panes/SignIn.tsx
View File

@@ -125,7 +125,7 @@ export const SignIn: FunctionComponent<Props> = observer(({ appState, applicatio
isInvalid={isEmailInvalid}
/>
{isEmailInvalid && !otherErrorMessage ? (
<div className="color-dark-red mb-4">Please provide a valid email.</div>
<div className="color-danger mb-4">Please provide a valid email.</div>
) : null}
<FloatingLabelInput
className={`min-w-90 xs:min-w-auto ${otherErrorMessage ? 'mb-2' : 'mb-4'}`}
@@ -138,7 +138,7 @@ export const SignIn: FunctionComponent<Props> = observer(({ appState, applicatio
disabled={isSigningIn}
isInvalid={isPasswordInvalid}
/>
{otherErrorMessage ? <div className="color-dark-red mb-4">{otherErrorMessage}</div> : null}
{otherErrorMessage ? <div className="color-danger mb-4">{otherErrorMessage}</div> : null}
</div>
<Button
className={`${isSigningIn ? 'min-w-30' : 'min-w-24'} py-2.5 mb-5`}
@@ -148,7 +148,7 @@ export const SignIn: FunctionComponent<Props> = observer(({ appState, applicatio
disabled={isSigningIn}
/>
</form>
<div className="text-sm font-medium color-grey-1">
<div className="text-sm font-medium color-passive-1">
Don’t have an account yet?{' '}
<a
className={`color-info ${isSigningIn ? 'cursor-not-allowed' : 'cursor-pointer '}`}

6
app/assets/javascripts/Components/PurchaseFlow/PurchaseFlowView.tsx
View File

@@ -29,7 +29,7 @@ export const PurchaseFlowView: FunctionComponent<PurchaseFlowViewProps> = observ
const { currentPane } = appState.purchaseFlow
return (
<div className="flex items-center justify-center overflow-hidden h-full w-full absolute top-left-0 z-index-purchase-flow bg-grey-super-light">
<div className="flex items-center justify-center overflow-hidden h-full w-full absolute top-left-0 z-index-purchase-flow bg-passive-super-light">
<div className="relative fit-content">
<div className="relative p-12 xs:px-8 mb-4 bg-default border-1 border-solid border-main rounded xs:rounded-0">
<SNLogoFull className="mb-5" />
@@ -37,7 +37,7 @@ export const PurchaseFlowView: FunctionComponent<PurchaseFlowViewProps> = observ
</div>
<div className="flex justify-end xs:px-4">
<a
className="mr-3 font-medium color-grey-1"
className="mr-3 font-medium color-passive-1"
href="https://standardnotes.com/privacy"
target="_blank"
rel="noopener noreferrer"
@@ -45,7 +45,7 @@ export const PurchaseFlowView: FunctionComponent<PurchaseFlowViewProps> = observ
Privacy
</a>
<a
className="font-medium color-grey-1"
className="font-medium color-passive-1"
href="https://standardnotes.com/help"
target="_blank"
rel="noopener noreferrer"