Web:Client:Components: fixed product name color for dark and base theme
This commit is contained in:
parent
55fe7bd155
commit
f955bea115
@ -1,18 +1,18 @@
|
||||
import styled from "styled-components";
|
||||
import Heading from "@appserver/components/heading";
|
||||
import Base from "@appserver/components/themes/base";
|
||||
import NoUserSelect from "@appserver/components/utils/commonStyles";
|
||||
import { tablet } from "@appserver/components/utils/device";
|
||||
import styled from 'styled-components';
|
||||
import Heading from '@appserver/components/heading';
|
||||
import Base from '@appserver/components/themes/base';
|
||||
import NoUserSelect from '@appserver/components/utils/commonStyles';
|
||||
import { tablet } from '@appserver/components/utils/device';
|
||||
const size = {
|
||||
header: "28px",
|
||||
menu: "23px",
|
||||
content: "21px",
|
||||
header: '28px',
|
||||
menu: '23px',
|
||||
content: '21px',
|
||||
};
|
||||
|
||||
const weight = {
|
||||
header: 600,
|
||||
menu: "bold",
|
||||
content: "bold",
|
||||
menu: 'bold',
|
||||
content: 'bold',
|
||||
};
|
||||
|
||||
const StyledHeading = styled(Heading)`
|
||||
@ -23,7 +23,7 @@ const StyledHeading = styled(Heading)`
|
||||
color: ${(props) => (props.color ? props.color : props.theme.color)};
|
||||
${NoUserSelect}
|
||||
@media ${tablet} {
|
||||
${(props) => props.headlineType === "content" && "font-size: 18px"};
|
||||
${(props) => props.headlineType === 'content' && 'font-size: 18px'};
|
||||
}
|
||||
`;
|
||||
StyledHeading.defaultProps = { theme: Base };
|
||||
|
@ -1783,6 +1783,7 @@ const Base = {
|
||||
header: {
|
||||
backgroundColor: "#0F4071",
|
||||
linkColor: "#7a95b0",
|
||||
productColor: white,
|
||||
},
|
||||
|
||||
menuContainer: {
|
||||
|
@ -1784,6 +1784,7 @@ const Dark = {
|
||||
header: {
|
||||
backgroundColor: "#1f1f1f ",
|
||||
linkColor: "#a9a9a9",
|
||||
productColor: "#eeeeee",
|
||||
},
|
||||
|
||||
menuContainer: {
|
||||
|
@ -147,6 +147,7 @@ const HeaderComponent = ({
|
||||
isAdmin,
|
||||
backdropClick,
|
||||
isPersonal,
|
||||
theme,
|
||||
...props
|
||||
}) => {
|
||||
const { t } = useTranslation('Common');
|
||||
@ -207,7 +208,11 @@ const HeaderComponent = ({
|
||||
</LinkWithoutRedirect>
|
||||
|
||||
{!isPersonal && (
|
||||
<Headline className="header-module-title" type="header" onClick={onClick}>
|
||||
<Headline
|
||||
className="header-module-title"
|
||||
type="header"
|
||||
color={theme.header.productColor}
|
||||
onClick={onClick}>
|
||||
{currentProductName}
|
||||
</Headline>
|
||||
)}
|
||||
@ -302,12 +307,13 @@ export default inject(({ auth }) => {
|
||||
availableModules,
|
||||
version,
|
||||
} = auth;
|
||||
const { logoUrl, defaultPage, currentProductId, personal: isPersonal } = settingsStore;
|
||||
const { logoUrl, defaultPage, currentProductId, personal: isPersonal, theme } = settingsStore;
|
||||
const { totalNotifications } = moduleStore;
|
||||
|
||||
//TODO: restore when chat will complete -> const mainModules = availableModules.filter((m) => !m.isolateMode);
|
||||
|
||||
return {
|
||||
theme,
|
||||
isPersonal,
|
||||
isAdmin,
|
||||
defaultPage,
|
||||
|
Loading…
Reference in New Issue
Block a user