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

nijil/aum/FEQ-739/fix alignment issues for feature branch 1 #10252

Merged
merged 2 commits into from
Sep 26, 2023
Merged

nijil/aum/FEQ-739/fix alignment issues for feature branch 1 #10252

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aa54f3f
fix: fixed height of pa deposit payment methods dropdown
aum-deriv Sep 22, 2023
8fff052
fix: fixing tabs component for alignment issues
aum-deriv Sep 26, 2023
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
6 changes: 3 additions & 3 deletions packages/appstore/src/components/modals/wallet-modal/wallet-modal-body.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ const WalletModalBody = observer(
<Tabs
active_icon_color={is_dark ? 'var(--badge-white)' : ''}
active_index={tabs[active_modal_tab || 'Deposit']}
className={classNames('modal-body__tabs', {
className={classNames('wallet-modal', {
is_scrolled: is_mobile && !is_wallet_name_visible,
})}
has_active_line={false}
Expand All @@ -78,12 +78,12 @@ const WalletModalBody = observer(
return (
<div key={option.label} icon={option.icon} label={option.label}>
<ThemedScrollbars
className='dc-tabs--modal-body__tabs__themed-scrollbar'
className='dc-tabs--wallet-modal-themed-scrollbar'
is_scrollbar_hidden={is_mobile}
onScroll={contentScrollHandler}
>
<Div100vhContainer height_offset={getHeightOffset()}>
<div className='dc-tabs--modal-body__tabs__content-wrapper'>
<div className='dc-tabs--wallet-modal-content-wrapper'>
{option.content({
is_wallet_name_visible,
contentScrollHandler,
Expand Down
4 changes: 2 additions & 2 deletions packages/appstore/src/components/modals/wallet-modal/wallet-modal-header.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ const WalletModalHeader = ({
const is_crypto = currency_config?.is_crypto;
const display_currency_code = currency_config?.display_code;

const header_class_name = 'modal-header';
const header_class_name = 'wallet-modal--header';

const getCloseIcon = React.useCallback(() => {
if (is_demo && is_dark) return 'IcAppstoreCloseLight';
Expand Down Expand Up @@ -58,7 +58,7 @@ const WalletModalHeader = ({
};

return (
<div className={`header-background ${gradient_header_class}`}>
<div className={`wallet-modal--header-background ${gradient_header_class}`}>
<div
className={classNames(header_class_name, {
[`${header_class_name}--hidden-title`]: is_mobile && !is_wallet_name_visible,
Expand Down
219 changes: 109 additions & 110 deletions packages/appstore/src/components/modals/wallet-modal/wallet-modal.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,23 +14,115 @@
@include mobile {
margin: 0;
}
}

.header-background {
width: 100%;
display: flex;
justify-content: center;
position: relative;
overflow: hidden;
// styles for mobile and desktop modal body (tabs with content)
.dc-tabs {
&--wallet-modal {
width: 100%;
margin-top: -4.8rem;
z-index: 9999;

@include mobile {
position: fixed;
z-index: 3;
@include mobile {
top: 8.2rem;
margin-top: 0;
transition: top 0.2s ease;

&.is_scrolled {
top: 4.2rem;
}
}

&-themed-scrollbar {
width: 100%;
}

&-content-wrapper {
max-width: 128rem;
margin: 0 auto;
padding: 2.4rem 4rem;

@include mobile {
padding: 1.6rem;
}
}
}
&__list {
padding: 0 4rem;

@include mobile {
padding: 0 1.6rem;
}

&--wallet-modal {
max-width: 128rem;
width: 100%;
margin: 0 auto;

@include mobile {
width: 100%;
z-index: 3;
overflow-x: scroll;

/* IE and Edge */
-ms-overflow-style: none;
/* Firefox */
scrollbar-width: none;

&::-webkit-scrollbar {
display: none;
}

&::-webkit-scrollbar-thumb {
display: none;
}

&.is_scrolled {
top: 4.4rem;
}
}
}
}

&__item {
display: flex;
align-items: center;
justify-content: center;
padding: 0 3.2rem;
height: 4.8rem;

@include mobile {
padding: 0 1.6rem;
height: 4rem;
font-size: var(--text-size-xxs);
}

&__icon {
padding: 0;
margin-right: 0.8rem;
}
}

&__active {
background-color: var(--general-main-1);
border-radius: 1.6rem 1.6rem 0 0;
}

&__content {
width: 100%;
font-size: var(--text-size-l);
color: var(--text-prominent);
display: flex;
align-items: center;
justify-content: center;

@include mobile {
font-size: var(--text-size-xs);
}
}
}
}

// styles for mobile and desktop modal header
.modal-header {
.wallet-modal--header {
max-width: 128rem;
width: 100%;
display: flex;
Expand Down Expand Up @@ -110,110 +202,17 @@
cursor: pointer;
}
}
}

// styles for mobile and desktop modal body (tabs with content)
.dc-tabs {
&--modal-body__tabs {
width: 100%;
margin-top: -4.8rem;
z-index: 9999;

@include mobile {
top: 8.2rem;
margin-top: 0;
transition: top 0.2s ease;

&.is_scrolled {
top: 4.2rem;
}
}

&__themed-scrollbar {
width: 100%;
}

&__content-wrapper {
max-width: 128rem;
margin: 0 auto;
padding: 2.4rem 4rem;

@include mobile {
padding: 1.6rem;
}
}
}
&__list {
padding: 0 4rem;

@include mobile {
padding: 0 1.6rem;
}

&--header--modal-body__tabs {
max-width: 128rem;
width: 100%;
margin: 0 auto;

@include mobile {
width: 100%;
z-index: 3;
overflow-x: scroll;

/* IE and Edge */
-ms-overflow-style: none;
/* Firefox */
scrollbar-width: none;

&::-webkit-scrollbar {
display: none;
}

&::-webkit-scrollbar-thumb {
display: none;
}

&.is_scrolled {
top: 4.4rem;
}
}
}
}

&__item {
display: flex;
align-items: center;
justify-content: center;
padding: 0 3.2rem;
height: 4.8rem;

@include mobile {
padding: 0 1.6rem;
height: 4rem;
font-size: var(--text-size-xxs);
}

&__icon {
padding: 0;
margin-right: 0.8rem;
}
}

&__active {
background-color: var(--general-main-1);
border-radius: 1.6rem 1.6rem 0 0;
}

&__content {
&-background {
width: 100%;
font-size: var(--text-size-l);
color: var(--text-prominent);
display: flex;
align-items: center;
justify-content: center;
position: relative;
overflow: hidden;

@include mobile {
font-size: var(--text-size-xs);
position: fixed;
z-index: 3;
}
}
}
Loading