Skip to content
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.

Sign up for GitHub

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

Jump to bottom

MaryiaF/fix: bold the menu option when the user has gone by the child… #4965

Merged
merged 12 commits into from
Mar 16, 2022
Merged

MaryiaF/fix: bold the menu option when the user has gone by the child… #4965

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
a0fb905
MaryiaF/fix: bold the menu option when the user has gone by the child…
Mar 2, 2022
cbfd7bf
MaryiaF/refactor: solution with switching to the bold menu item
Mar 2, 2022
fdbdd51
MaryiaF/chore: revert intent
Mar 2, 2022
a1753c5
MaryiaF/refactor: use Text component instead of spane in toggle-menu-…
Mar 3, 2022
c01e054
MaryiaF/refactor: remove unuseful style and change import
Mar 3, 2022
b99e7b0
Merge branch 'master' of github.com:binary-com/deriv-app into 57685_2
Mar 9, 2022
2c19bed
Merge branch 'master' of github.com:binary-com/deriv-app into 57685_2
Mar 9, 2022
61ebd5b
MaryiaF/fix: all the sub menus are not supposed to be in bold in firs…
Mar 9, 2022
7b506dc
MaryiaF/fix: condition when the menu item should be bold
Mar 9, 2022
5e5bc38
MaryiaF/fix: remove console.log
Mar 9, 2022
5f96dd3
Revert "Merge branch 'master' of github.com:binary-com/deriv-app into…
Mar 10, 2022
b4eda74
Merge branch 'master' into 57685_2
carolsachdeva Mar 16, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion packages/components/src/components/mobile-drawer/mobile-drawer-submenu.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ const SubMenu = ({
submenu_icon,
submenu_title,
submenu_suffix_icon,
route_config_path,
}) => {
const [is_expanded, setIsExpanded] = React.useState(false);

Expand All @@ -28,7 +29,11 @@ const SubMenu = ({
<div className={classNames('dc-mobile-drawer__submenu-toggle', submenu_toggle_class)} onClick={toggleMenu}>
{submenu_icon && <Icon className='dc-mobile-drawer__submenu-toggle-icon' icon={submenu_icon} />}
{submenu_title && (
<Text as='h3' size='xs'>
<Text
as='h3'
size='xs'
weight={window.location.pathname.startsWith(route_config_path) ? 'bold' : null}
>
{submenu_title}
</Text>
)}
Expand Down
10 changes: 6 additions & 4 deletions packages/core/src/App/Components/Layout/Header/toggle-menu-drawer.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import { BinaryLink } from 'App/Components/Routes';
import getRoutesConfig from 'App/Constants/routes-config';
import { currentLanguage, changeLanguage } from 'Utils/Language';
import LiveChat from 'App/Components/Elements/LiveChat';
import Text from '../../../../../../components/src/components/text/text';
Copy link
Contributor

@balakrishna-deriv balakrishna-deriv Mar 3, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@maryiafrantsava-deriv Text component should be imported at line 3

import { Div100vhContainer, Icon, MobileDrawer, ToggleSwitch, Text } from '@deriv/components';

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i've done


const MenuLink = ({
changeCurrentLanguage,
Expand Down Expand Up @@ -64,7 +65,9 @@ const MenuLink = ({
onClick={onClickLink}
>
<Icon className='header__menu-mobile-link-icon' icon={icon} />
<span className='header__menu-mobile-link-text'>{text}</span>
<Text as='h3' size='xs' weight={window.location.pathname === '/' ? 'bold' : null}>
{text}
</Text>
{suffix_icon && <Icon className='header__menu-mobile-link-suffix-icon' icon={suffix_icon} />}
</BinaryLink>
);
Expand Down Expand Up @@ -178,6 +181,7 @@ const ToggleMenuDrawer = React.forwardRef(
submenu_title={route_config.getTitle()}
submenu_suffix_icon='IcChevronRight'
onToggle={expandSubMenu}
route_config_path={route_config.path}
>
{!has_subroutes &&
route_config.routes.map((route, index) => {
Expand Down Expand Up @@ -337,9 +341,7 @@ const ToggleMenuDrawer = React.forwardRef(
toggleTheme(!is_dark_mode);
}}
>
<div
className={classNames('header__menu-mobile-link')}
>
<div className={classNames('header__menu-mobile-link')}>
<Icon className='header__menu-mobile-link-icon' icon={'IcTheme'} />
<span className='header__menu-mobile-link-text'>
{localize('Dark theme')}
Expand Down
3 changes: 3 additions & 0 deletions packages/core/src/sass/app/_common/layout/header.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,9 @@
font-weight: bold;
color: var(--text-prominent);
}
.header__menu-mobile-link-text-regular {
balakrishna-deriv marked this conversation as resolved.
Show resolved Hide resolved
color: var(--text-prominent);
}
}
&-text {
font-size: 1.4rem;
Expand Down