Skip to content

Commit 7893ff9

Browse files
fix(app): to dev styles (#1200)
2 parents 2261b82 + a758717 commit 7893ff9

File tree

12 files changed

+51
-23
lines changed

12 files changed

+51
-23
lines changed

src/components/appMenu/CircularMenu.tsx

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ declare module 'react' {
1010
interface CSSProperties {
1111
'--diameter'?: string;
1212
'--delta'?: string;
13+
'--icon-size'?: string;
14+
'--button-size'?: string;
1315
}
1416
}
1517

@@ -19,6 +21,9 @@ function CircularMenu({ circleSize }) {
1921
const linkChunks = _.chunk(itemsMenu(), chunkSize);
2022
const location = useLocation();
2123

24+
const buttonSize = Math.min(circleSize * 0.15, 38);
25+
const iconSize = buttonSize - 8;
26+
2227
const calculateDiameter = (index, circleSize) => {
2328
const menuCircleDiameter = circleSize / 2 + 40 * (index + 1) - 10;
2429
const nextLevelMenuAngle = index === 1 ? 11 : 0;
@@ -68,6 +73,8 @@ function CircularMenu({ circleSize }) {
6873
style={{
6974
'--diameter': `${menuCircleDiameter}px`,
7075
'--delta': `${nextLevelMenuAngle}deg`,
76+
'--icon-size': `${iconSize}px`,
77+
'--button-size': `${buttonSize}px`,
7178
}}
7279
>
7380
{chunk.map((item, index) => {

src/components/appMenu/CircularMenuItem.module.scss

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
opacity: 1;
66
background-color: #101010;
77
border-radius: 50%;
8-
width: 38px;
9-
height: 38px;
8+
width: var(--button-size, 38px);
9+
height: var(--button-size, 38px);
1010
justify-content: center;
1111
align-items: center;
1212
display: flex;
@@ -30,8 +30,8 @@
3030
}
3131

3232
.icon {
33-
width: 30px;
34-
height: 30px;
33+
width: var(--icon-size, 30px);
34+
height: var(--icon-size, 30px);
3535
object-fit: fill;
3636
border-radius: 50%;
3737
justify-content: center;

src/components/appMenu/MobileMenu.module.scss

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,9 @@
2121

2222
&.open {
2323
pointer-events: auto;
24+
background: #0000008c;
25+
backdrop-filter: blur(7px);
26+
z-index: 2;
2427
}
2528
}
2629

src/containers/application/Header/Commander/Commander.module.scss

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
.wrapper {
2-
width: 100%;
3-
42
width: 62%;
53
transform: translate(-50%, -80%);
64
background: rgb(0 0 0 / 79%);
@@ -9,6 +7,13 @@
97
position: absolute;
108
top: 50%;
119
z-index: 1;
10+
// width left and right sideBar , gap and paddings
11+
max-width: calc(100vw - 200px - 300px - 100px);
12+
13+
@media (max-width: 540px) {
14+
width: 40%;
15+
max-width: unset;
16+
}
1217
}
1318

1419
.input {

src/containers/application/Header/CurrentApp/CurrentApp.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ function CurrentApp() {
1919
const location = useLocation();
2020
const address = useAppSelector(selectCurrentAddress);
2121
const { passport } = usePassportByAddress(address);
22-
const [openMenu, setOpenMenu] = useState(true);
22+
const [openMenu, setOpenMenu] = useState(false);
2323

2424
const getRoute = useMemo(() => {
2525
const { pathname } = location;

src/containers/application/Header/Header.module.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
top: 0;
66
padding: 15px;
77
padding-bottom: 0;
8-
z-index: 3;
8+
z-index: 4;
99

1010
&::before {
1111
content: '';

src/containers/application/Header/SwitchAccount/SwitchAccount.module.scss

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,17 @@
3535
align-items: center;
3636
height: 105px;
3737

38+
@media (max-width: 540px) {
39+
grid-template-columns: 1fr 60px;
40+
gap: 10px;
41+
height: 60px;
42+
}
43+
3844
.noAccount {
3945
color: var(--primary-color);
4046
}
4147

42-
& + & {
48+
&+& {
4349
margin-top: -30px;
4450
}
4551

@@ -123,6 +129,7 @@
123129

124130
&True {
125131
width: 100%;
132+
126133
&::before {
127134
@include before-Avatar;
128135
box-shadow: 0px 0px 20px #1fcbff66;
@@ -143,4 +150,4 @@
143150
width: 60px;
144151
height: 60px;
145152
}
146-
}
153+
}

src/containers/application/Header/SwitchAccount/SwitchAccount.tsx

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -153,18 +153,13 @@ function SwitchAccount() {
153153

154154
return (
155155
<div style={{ position: 'relative', fontSize: '20px' }} ref={containerRef}>
156-
<div
157-
className={styles.containerSwichAccount}
158-
style={{
159-
gridTemplateColumns: !mediaQuery ? '1fr' : '1fr 105px',
160-
}}
161-
>
162-
{!useGetAddress && (
156+
<div className={styles.containerSwichAccount}>
157+
{(!useGetAddress || !mediaQuery) && (
163158
<Link
164159
className={networkStyles.btnContainerText}
165160
to={routes.settings.path}
166161
>
167-
Settings
162+
{mediaQuery ? 'Settings' : '⚙️'}
168163
</Link>
169164
)}
170165
{mediaQuery && useGetAddress && (

src/features/adviser/AdviserContainer.module.scss

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,11 @@
1313

1414
display: flex;
1515
justify-content: center;
16+
17+
@media (max-width: 540px) {
18+
margin-top: unset;
19+
20+
}
1621
}
1722

1823
.blurWrapper {

src/layouts/Main.module.scss

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,5 +22,9 @@
2222
display: flex;
2323
position: fixed;
2424
right: 1vw;
25+
26+
@media (max-width: 540px) {
27+
right: 2vw;
28+
}
2529
}
2630
}

0 commit comments

Comments
 (0)