Skip to content
This repository was archived by the owner on Apr 5, 2022. It is now read-only.

Commit 81cfa6a

Browse files
committed
CJPM-18122 Change subtitle in TopNav
1 parent 23fb8fa commit 81cfa6a

6 files changed

Lines changed: 16 additions & 18 deletions

File tree

packages/visual-stack-redux/package-lock.json

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/visual-stack/src/components/TopNav/BackToCjLink.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ export const BackToCjLink = ({ className, title, onClick, ...restProps }) => {
1717
onClick={onClick}
1818
className="topnav-action"
1919
>
20-
<Text id="topnav-back-icon" className="vs-topnav-action-text">
20+
<Text id="topnav-back-icon" className="vs-topnav-action vs-topnav-text">
2121
<ArrowLeftIcon />
2222
</Text>
23-
<Text id="topnav-back-title" className="vs-topnav-action-text">
23+
<Text id="topnav-back-title" className="vs-topnav-action vs-topnav-text">
2424
{title}
2525
</Text>
2626
</Box>

packages/visual-stack/src/components/TopNav/CjSupportLink.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ export const CjSupportLink = ({ className, title, link, ...restProps }) => {
2121
align="center"
2222
className="vs-topnav-action"
2323
>
24-
<Text id="topnav-help-icon" className="vs-topnav-action-text">
24+
<Text id="topnav-help-icon" className="vs-topnav-action vs-topnav-text">
2525
<InformationOutlineIcon />
2626
</Text>
27-
<Text id="topnav-help-title" className="vs-topnav-action-text">
27+
<Text id="topnav-help-title" className="vs-topnav-action vs-topnav-text">
2828
{title}
2929
</Text>
3030
</Box>

packages/visual-stack/src/components/TopNav/TopNav.css

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,13 +83,11 @@
8383
}
8484

8585
.vs-topnav-action {
86-
color: #bebfc0 !important;
8786
cursor: pointer;
8887
}
8988

90-
.vs-topnav-action-text {
89+
.vs-topnav-text {
9190
color: #bebfc0 !important;
92-
cursor: pointer;
9391
}
9492

9593
a.vs-cj-support-link-container:hover {

packages/visual-stack/src/components/TopNav/TopNav.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import PropTypes from 'prop-types';
66
export const TopNav = ({
77
className,
88
title,
9-
subTitle,
9+
subtitle,
1010
actionChildren,
1111
children,
1212
contentSize,
@@ -22,7 +22,7 @@ export const TopNav = ({
2222
</div>
2323
<h1 className="vs-topnav-title">{title}</h1>
2424
</div>
25-
{subTitle ? <div className={"vs-topnav-action-text"}>{subTitle}</div> : ""}
25+
{subtitle ? <div className={"vs-topnav-text"}>{subtitle}</div> : ""}
2626
<div className="vs-topnav-button-bar">
2727
{actionChildren}
2828
</div>
@@ -44,6 +44,6 @@ TopNav.propTypes = {
4444
title: PropTypes.string,
4545
actionChildren: PropTypes.object,
4646
children: PropTypes.object,
47-
subTitle: PropTypes.object,
47+
subtitle: PropTypes.string,
4848
contentSize: PropTypes.string,
4949
};

packages/visual-stack/src/components/TopNav/tests/index.test.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ describe('BackToCjLink', () => {
6565
expect(wrapper.find(BackToCjLink).prop('title')).toBe('title');
6666
expect(wrapper.find(BackToCjLink).prop('onClick')()).toBe(2);
6767
expect(
68-
wrapper.find('.vs-topnav-action-text>#topnav-back-title').text()
68+
wrapper.find('.vs-topnav-action.vs-topnav-text>#topnav-back-title').text()
6969
).toEqual('title');
7070
});
7171
});
@@ -75,7 +75,7 @@ describe('CjSupportLink', () => {
7575
const wrapper = mount(<CjSupportLink title="title" link="link" />);
7676
expect(wrapper.find(CjSupportLink).prop('title')).toBe('title');
7777
expect(wrapper.find(CjSupportLink).prop('link')).toBe('link');
78-
expect(wrapper.find('.vs-topnav-action>#topnav-help-title').text()).toEqual(
78+
expect(wrapper.find('.vs-topnav-action.vs-topnav-text>#topnav-help-title').text()).toEqual(
7979
'title'
8080
);
8181
expect(wrapper.find('.vs-cj-support-link-container').props().href).toEqual(

0 commit comments

Comments
 (0)