-
-
Notifications
You must be signed in to change notification settings - Fork 1.2k
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
Consolidate Notice Colors #1724
Changes from 3 commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -100,7 +100,7 @@ function AccountCard({ account, updated, getBalanceQuery, onSelect }) { | |
{account.bankId && ( | ||
<View | ||
style={{ | ||
backgroundColor: theme.noticeText, | ||
backgroundColor: theme.noticeBackgroundDark, | ||
marginLeft: '-23px', | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. No change |
||
width: 8, | ||
height: 8, | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -45,7 +45,7 @@ export function ReconcilingMessage({ | |
{targetDiff === 0 ? ( | ||
<View | ||
style={{ | ||
color: theme.noticeText, | ||
color: theme.noticeTextLight, | ||
flex: 1, | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. No change |
||
flexDirection: 'row', | ||
alignItems: 'center', | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -93,7 +93,7 @@ function CategoryList({ | |
alignItems: 'center', | ||
fontSize: 11, | ||
fontWeight: 500, | ||
color: theme.noticeAccent, | ||
color: theme.noticeTextMenu, | ||
padding: '6px 8px', | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. No change |
||
':active': { | ||
backgroundColor: 'rgba(100, 100, 100, .25)', | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -99,7 +99,7 @@ function PayeeList({ | |
<View | ||
style={{ | ||
display: 'block', | ||
color: theme.noticeAccent, | ||
color: theme.noticeTextMenu, | ||
borderRadius: 4, | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. No change |
||
fontSize: isNarrowWidth ? 'inherit' : 11, | ||
fontWeight: 500, | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -99,7 +99,7 @@ function IncomeProgress({ current, target }: IncomeProgressProps) { | |
return ( | ||
<PieProgress | ||
progress={frac} | ||
color={over ? theme.errorText : theme.noticeText} | ||
color={over ? theme.errorText : theme.noticeTextLight} | ||
backgroundColor={over ? theme.errorBackground : theme.pageBackground} | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. No change |
||
style={{ width: 20, height: 20 }} | ||
/> | ||
|
@@ -132,7 +132,7 @@ function ExpenseProgress({ current, target }: ExpenseProgressProps) { | |
return ( | ||
<PieProgress | ||
progress={frac} | ||
color={over ? theme.errorText : theme.noticeText} | ||
color={over ? theme.errorText : theme.noticeTextLight} | ||
backgroundColor={over ? theme.errorBackground : theme.pageBackground} | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. No change |
||
style={{ width: 20, height: 20 }} | ||
/> | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -73,7 +73,7 @@ export default function ChangePassword() { | |
<Text | ||
style={{ | ||
marginTop: 20, | ||
color: theme.noticeText, | ||
color: theme.noticeTextLight, | ||
borderRadius: 4, | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. No change |
||
fontSize: 15, | ||
}} | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -10,7 +10,7 @@ function Change({ amount }) { | |
<Block | ||
style={{ | ||
...styles.smallText, | ||
color: amount < 0 ? theme.errorText : theme.noticeText, | ||
color: amount < 0 ? theme.errorText : theme.noticeTextLight, | ||
}} | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. No change |
||
> | ||
{amount >= 0 ? '+' : ''} | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -168,7 +168,7 @@ export function ScheduleAmountCell({ | |
<Text | ||
style={{ | ||
flex: 1, | ||
color: num > 0 ? theme.noticeText : theme.tableText, | ||
color: num > 0 ? theme.noticeTextLight : theme.tableText, | ||
whiteSpace: 'nowrap', | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. No change |
||
overflow: 'hidden', | ||
textOverflow: 'ellipsis', | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -26,7 +26,7 @@ export default function EncryptionSettings() { | |
primaryAction={<Button onClick={onChangeKey}>Generate new key</Button>} | ||
> | ||
<Text> | ||
<Text style={{ color: theme.noticeText, fontWeight: 600 }}> | ||
<Text style={{ color: theme.noticeTextLight, fontWeight: 600 }}> | ||
End-to-end Encryption is turned on. | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. No change |
||
</Text>{' '} | ||
Your data is encrypted with a key that only you have before sending it | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -1001,7 +1001,9 @@ class Transaction extends PureComponent { | |
style={{ | ||
width: 11, | ||
height: 11, | ||
color: cleared ? theme.noticeText : theme.altButtonBareText, | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. No change |
||
color: cleared | ||
? theme.noticeTextLight | ||
: theme.altButtonBareText, | ||
marginRight: 5, | ||
}} | ||
/> | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -416,7 +416,7 @@ function StatusCell({ | |
|
||
let statusColor = | ||
status === 'cleared' | ||
? theme.noticeText | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. No change |
||
? theme.noticeTextLight | ||
: status === 'missed' | ||
? theme.alt5ErrorText | ||
: status === 'due' | ||
|
@@ -1268,7 +1268,7 @@ const Transaction = memo(function Transaction(props) { | |
: integerToCurrency(runningBalance) | ||
} | ||
valueStyle={{ | ||
color: runningBalance < 0 ? theme.errorText : theme.noticeText, | ||
color: runningBalance < 0 ? theme.errorText : theme.noticeTextLight, | ||
}} | ||
style={{ ...styles.tnum, ...amountStyle }} | ||
width={88} | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
--- | ||
category: Enhancements | ||
authors: [carkom] | ||
--- | ||
|
||
Consolidate notice colors. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
No change