diff --git a/src/components/AvatarCropModal/AvatarCropModal.js b/src/components/AvatarCropModal/AvatarCropModal.js
index e32057d87301d..fe893d63e451d 100644
--- a/src/components/AvatarCropModal/AvatarCropModal.js
+++ b/src/components/AvatarCropModal/AvatarCropModal.js
@@ -14,7 +14,6 @@ import {
} from 'react-native-reanimated';
import CONST from '../../CONST';
import compose from '../../libs/compose';
-import colors from '../../styles/colors';
import styles from '../../styles/styles';
import themeColors from '../../styles/themes/default';
import Button from '../Button';
@@ -317,7 +316,7 @@ const AvatarCropModal = (props) => {
rotation={rotation}
/>
-
+
{
)}
diff --git a/src/components/ButtonWithDropdown.js b/src/components/ButtonWithDropdown.js
index 8955c3bc83b87..b1306b1a16e18 100644
--- a/src/components/ButtonWithDropdown.js
+++ b/src/components/ButtonWithDropdown.js
@@ -50,7 +50,7 @@ const ButtonWithDropdown = props => (
onPress={props.onDropdownPress}
shouldRemoveLeftBorderRadius
ContentComponent={() => (
-
+
)}
/>
diff --git a/src/components/FloatingActionButton.js b/src/components/FloatingActionButton.js
index cad001e75cd64..776e841eb0548 100644
--- a/src/components/FloatingActionButton.js
+++ b/src/components/FloatingActionButton.js
@@ -62,12 +62,12 @@ class FloatingActionButton extends PureComponent {
const backgroundColor = this.animatedValue.interpolate({
inputRange: [0, 1],
- outputRange: [themeColors.buttonSuccessBG, themeColors.buttonDefaultBG],
+ outputRange: [themeColors.success, themeColors.buttonDefaultBG],
});
const fill = this.animatedValue.interpolate({
inputRange: [0, 1],
- outputRange: [themeColors.componentBG, themeColors.heading],
+ outputRange: [themeColors.textLight, themeColors.textDark],
});
return (
diff --git a/src/components/InlineSystemMessage.js b/src/components/InlineSystemMessage.js
index 0b6645fe255b6..cad5c6cdeef1d 100644
--- a/src/components/InlineSystemMessage.js
+++ b/src/components/InlineSystemMessage.js
@@ -22,7 +22,7 @@ const InlineSystemMessage = (props) => {
}
return (
-
+
{props.message}
);
diff --git a/src/components/Onfido/BaseOnfidoWeb.js b/src/components/Onfido/BaseOnfidoWeb.js
index b1114f911abd0..92c868548001a 100644
--- a/src/components/Onfido/BaseOnfidoWeb.js
+++ b/src/components/Onfido/BaseOnfidoWeb.js
@@ -7,7 +7,7 @@ import withLocalize, {withLocalizePropTypes} from '../withLocalize';
import onfidoPropTypes from './onfidoPropTypes';
import CONST from '../../CONST';
import variables from '../../styles/variables';
-import colors from '../../styles/colors';
+import themeColors from '../../styles/themes/default';
import fontWeightBold from '../../styles/fontWeight/bold';
import fontFamily from '../../styles/fontFamily';
import Log from '../../libs/Log';
@@ -30,29 +30,29 @@ class Onfido extends React.Component {
fontWeightTitle: fontWeightBold,
fontWeightSubtitle: 400,
fontSizeSubtitle: `${variables.fontSizeNormal}px`,
- colorContentTitle: colors.dark,
- colorContentSubtitle: colors.dark,
- colorContentBody: colors.dark,
+ colorContentTitle: themeColors.text,
+ colorContentSubtitle: themeColors.text,
+ colorContentBody: themeColors.text,
borderRadiusButton: `${variables.componentBorderRadius}px`,
- colorBackgroundSurfaceModal: colors.white,
- colorBorderDocTypeButton: colors.gray2,
- colorBorderDocTypeButtonHover: colors.blue,
- colorBackgroundButtonPrimary: colors.green,
- colorBackgroundButtonPrimaryHover: colors.greenHover,
- colorBackgroundButtonPrimaryActive: colors.greenHover,
- colorBorderButtonPrimary: colors.green,
- colorContentButtonSecondaryText: colors.dark,
- colorBackgroundButtonSecondary: colors.gray2,
- colorBackgroundButtonSecondaryHover: colors.gray3,
- colorBackgroundButtonSecondaryActive: colors.gray3,
- colorBorderButtonSecondary: colors.gray2,
- colorBackgroundIcon: colors.white,
- colorContentLinkTextHover: colors.white,
- colorBorderLinkUnderline: colors.blue,
- colorBackgroundLinkHover: colors.blue,
- colorBackgroundLinkActive: colors.blue,
- authAccentColor: colors.blue,
- colorBackgroundInfoPill: colors.blue,
+ colorBackgroundSurfaceModal: themeColors.appBG,
+ colorBorderDocTypeButton: themeColors.border,
+ colorBorderDocTypeButtonHover: themeColors.link,
+ colorBackgroundButtonPrimary: themeColors.success,
+ colorBackgroundButtonPrimaryHover: themeColors.successHover,
+ colorBackgroundButtonPrimaryActive: themeColors.successHover,
+ colorBorderButtonPrimary: themeColors.success,
+ colorContentButtonSecondaryText: themeColors.text,
+ colorBackgroundButtonSecondary: themeColors.border,
+ colorBackgroundButtonSecondaryHover: themeColors.icon,
+ colorBackgroundButtonSecondaryActive: themeColors.icon,
+ colorBorderButtonSecondary: themeColors.border,
+ colorBackgroundIcon: themeColors.appBG,
+ colorContentLinkTextHover: themeColors.appBG,
+ colorBorderLinkUnderline: themeColors.link,
+ colorBackgroundLinkHover: themeColors.link,
+ colorBackgroundLinkActive: themeColors.link,
+ authAccentColor: themeColors.link,
+ colorBackgroundInfoPill: themeColors.link,
},
steps: [
{
diff --git a/src/components/OptionRow.js b/src/components/OptionRow.js
index 29c27cf579607..e65bf5a0e26f2 100644
--- a/src/components/OptionRow.js
+++ b/src/components/OptionRow.js
@@ -16,7 +16,7 @@ import MultipleAvatars from './MultipleAvatars';
import Hoverable from './Hoverable';
import DisplayNames from './DisplayNames';
import IOUBadge from './IOUBadge';
-import colors from '../styles/colors';
+import themeColors from '../styles/themes/default';
import withLocalize, {withLocalizePropTypes} from './withLocalize';
import Text from './Text';
import SelectCircle from './SelectCircle';
@@ -81,7 +81,7 @@ const propTypes = {
const defaultProps = {
accessibilityHint: '',
alternateTextAccessibilityLabel: '',
- backgroundColor: colors.white,
+ backgroundColor: themeColors.appBG,
hoverStyle: styles.sidebarLinkHover,
hideAdditionalOptionStates: false,
showSelectedState: false,
@@ -238,7 +238,7 @@ const OptionRow = (props) => {
diff --git a/src/components/ReportActionsSkeletonView/SkeletonViewLines.js b/src/components/ReportActionsSkeletonView/SkeletonViewLines.js
index 51b0fe54f73b5..e70fd65cae873 100644
--- a/src/components/ReportActionsSkeletonView/SkeletonViewLines.js
+++ b/src/components/ReportActionsSkeletonView/SkeletonViewLines.js
@@ -3,6 +3,7 @@ import PropTypes from 'prop-types';
import {Rect, Circle} from 'react-native-svg';
import SkeletonViewContentLoader from 'react-content-loader/native';
import CONST from '../../CONST';
+import themeColors from '../../styles/themes/default';
const propTypes = {
/** Number of rows to show in Skeleton UI block */
@@ -12,6 +13,8 @@ const propTypes = {
const SkeletonViewLines = props => (
diff --git a/src/components/ReportHeaderSkeletonView.js b/src/components/ReportHeaderSkeletonView.js
index 85f2b955e65d0..fd7818573ffeb 100644
--- a/src/components/ReportHeaderSkeletonView.js
+++ b/src/components/ReportHeaderSkeletonView.js
@@ -7,6 +7,7 @@ import Icon from './Icon';
import * as Expensicons from './Icon/Expensicons';
import withWindowDimensions, {windowDimensionsPropTypes} from './withWindowDimensions';
import variables from '../styles/variables';
+import themeColors from '../styles/themes/default';
const propTypes = {
...windowDimensionsPropTypes,
@@ -24,6 +25,8 @@ const ReportHeaderSkeletonView = props => (
diff --git a/src/libs/Navigation/NavigationRoot.js b/src/libs/Navigation/NavigationRoot.js
index 775d89f31b926..df43bb775b996 100644
--- a/src/libs/Navigation/NavigationRoot.js
+++ b/src/libs/Navigation/NavigationRoot.js
@@ -6,7 +6,7 @@ import Navigation, {navigationRef} from './Navigation';
import linkingConfig from './linkingConfig';
import AppNavigator from './AppNavigator';
import FullScreenLoadingIndicator from '../../components/FullscreenLoadingIndicator';
-import colors from '../../styles/colors';
+import themeColors from '../../styles/themes/default';
import styles from '../../styles/styles';
import UnreadIndicatorUpdater from '../UnreadIndicatorUpdater';
import Log from '../Log';
@@ -16,7 +16,7 @@ const navigationTheme = {
...DefaultTheme,
colors: {
...DefaultTheme.colors,
- background: colors.gray1,
+ background: themeColors.highlightBG,
},
};
diff --git a/src/pages/settings/Profile/LoginField.js b/src/pages/settings/Profile/LoginField.js
index a23a5f3ac8d04..37cc424535c4f 100755
--- a/src/pages/settings/Profile/LoginField.js
+++ b/src/pages/settings/Profile/LoginField.js
@@ -3,7 +3,7 @@ import {View} from 'react-native';
import PropTypes from 'prop-types';
import Text from '../../../components/Text';
import styles from '../../../styles/styles';
-import colors from '../../../styles/colors';
+import themeColors from '../../../styles/themes/default';
import * as Expensicons from '../../../components/Icon/Expensicons';
import Icon from '../../../components/Icon';
import ROUTES from '../../../ROUTES';
@@ -112,7 +112,7 @@ class LoginField extends Component {
style={[styles.mb2]}
onPress={this.onResendClicked}
ContentComponent={() => (this.state.showCheckmarkIcon ? (
-
+
) : (
{this.props.translate('common.resend')}
diff --git a/src/pages/settings/Profile/PronounsPage.js b/src/pages/settings/Profile/PronounsPage.js
index 796becb03cb3e..72fbbc585d570 100644
--- a/src/pages/settings/Profile/PronounsPage.js
+++ b/src/pages/settings/Profile/PronounsPage.js
@@ -36,7 +36,7 @@ const PronounsPage = (props) => {
// Add green checkmark icon & bold the timezone text
customIcon: fullPronounKey === currentPronouns
- ? {src: Expensicons.Checkmark, color: themeColors.textSuccess}
+ ? {src: Expensicons.Checkmark, color: themeColors.success}
: null,
isUnread: fullPronounKey === currentPronouns,
};
diff --git a/src/stories/PopoverMenu.stories.js b/src/stories/PopoverMenu.stories.js
index 299ce3fb2d705..fcf8110e93bea 100644
--- a/src/stories/PopoverMenu.stories.js
+++ b/src/stories/PopoverMenu.stories.js
@@ -3,7 +3,7 @@ import {SafeAreaProvider} from 'react-native-safe-area-context';
import PopoverMenu from '../components/PopoverMenu';
import * as Expensicons from '../components/Icon/Expensicons';
import MenuItem from '../components/MenuItem';
-import colors from '../styles/colors';
+import themeColors from '../styles/themes/default';
/**
* We use the Component Story Format for writing stories. Follow the docs here:
@@ -25,7 +25,7 @@ const Template = (args) => {
// eslint-disable-next-line react/jsx-props-no-spreading
{...args.menuItem}
onPress={toggleVisibility}
- wrapperStyle={isVisible ? [{backgroundColor: colors.gray2}] : []}
+ wrapperStyle={isVisible ? [{backgroundColor: themeColors.border}] : []}
/>
{
const minMilisecondsToWait = 1.5 * 1000;
@@ -8,6 +9,7 @@ document.addEventListener('DOMContentLoaded', () => {
const splash = document.getElementById('splash');
const splashLogo = document.querySelector('.splash-logo');
const root = document.getElementById('root');
+ splash.style.backgroundColor = themeColors.appBG;
splashLogo.innerHTML = newExpensifyLogo;