diff --git a/craco.config.js b/craco.config.js index eea1ec9..91c22fd 100644 --- a/craco.config.js +++ b/craco.config.js @@ -8,11 +8,11 @@ module.exports = { options: { lessLoaderOptions: { lessOptions: { - modifyVars: { '@primary-color': colors.blue[0] }, - javascriptEnabled: true - } - } - } - } - ] + modifyVars: { '@primary-color': colors.primaryColor }, + javascriptEnabled: true, + }, + }, + }, + }, + ], }; diff --git a/src/client/Containers/Calculation/lib/renderSections.js b/src/client/Containers/Calculation/lib/renderSections.js index 1bbb23f..4c5d445 100644 --- a/src/client/Containers/Calculation/lib/renderSections.js +++ b/src/client/Containers/Calculation/lib/renderSections.js @@ -77,7 +77,12 @@ export const renderGroups = ({ groups }) => { return ( {blocksTitle && ( - + {blocksTitle} )} diff --git a/src/client/Elements/Text.jsx b/src/client/Elements/Text.jsx index 0a782a4..d80bc43 100644 --- a/src/client/Elements/Text.jsx +++ b/src/client/Elements/Text.jsx @@ -12,5 +12,5 @@ export const SecondaryText = styled(PrimaryText)` `; export const SecondaryColoredText = styled(SecondaryText)` - color: ${colors.blueTemp[300]}; + color: ${colors.secondaryColor}; `; diff --git a/src/client/Layout/index.jsx b/src/client/Layout/index.jsx index a99a13f..d7cfd58 100644 --- a/src/client/Layout/index.jsx +++ b/src/client/Layout/index.jsx @@ -1,4 +1,5 @@ import paths from 'client/common/paths'; +import Spinner from 'client/Components/Spinner'; import colors from 'client/UIKit/colors'; import { Box, Flex } from 'client/UIKit/grid'; import mq from 'client/UIKit/mq'; @@ -6,13 +7,12 @@ import React, { Suspense } from 'react'; import { Route, Switch } from 'react-router-dom'; import styled from 'styled-components'; import Logo from './Logo'; -import Spinner from 'client/Components/Spinner'; const HeaderContent = styled(Flex)` background: ${`linear-gradient(90deg, - ${colors.blueTemp[0]} 0%, - ${colors.blueTemp[300]} 50%, - ${colors.blueTemp[600]} 100%)`}; + ${colors.primaryColor} 0%, + ${colors.secondaryColor} 50%, + ${colors.tertiaryColor} 100%)`}; height: 45px; ${mq.tablet` diff --git a/src/client/UIKit/colors.js b/src/client/UIKit/colors.js index d2008bd..c42e275 100644 --- a/src/client/UIKit/colors.js +++ b/src/client/UIKit/colors.js @@ -1,6 +1,7 @@ +const { isDevelopment } = require('core/tools/environment'); const createColorProxy = require('./lib/createColorProxy'); -module.exports = { +const colors = { black: createColorProxy( { 0: '#000000', @@ -82,5 +83,12 @@ module.exports = { }, 'blue', '#1C01A9' - ) + ), +}; + +module.exports = { + ...colors, + primaryColor: isDevelopment ? colors.blueTemp[500] : colors.blue[0], + secondaryColor: isDevelopment ? colors.blueTemp[600] : colors.blueTemp[300], + tertiaryColor: isDevelopment ? colors.blueTemp[200] : colors.blueTemp[600], }; diff --git a/src/core/tools/environment.js b/src/core/tools/environment.js new file mode 100644 index 0000000..d2c10a5 --- /dev/null +++ b/src/core/tools/environment.js @@ -0,0 +1,2 @@ +export const isDevelopment = + process.env.NODE_ENV === 'development' || process.env.crm !== 'prod';