Skip to content

Commit c15683d

Browse files
Merge branch 'dev' into QA-Fixes
2 parents 2045323 + 1a0a66b commit c15683d

File tree

4 files changed

+38
-52
lines changed

4 files changed

+38
-52
lines changed

src/ui/layouts/common/SidePopup/index.module.scss

Lines changed: 21 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -3,26 +3,37 @@
33
.dimmer {
44
position: fixed;
55
backdrop-filter: blur(4px);
6-
// background: #424240;
7-
// opacity: 0.5;
86
height: 100vh;
97
width: 100vw;
108
top: 0;
119
left: 0;
1210
z-index: 9999;
1311
}
1412

13+
.popupContainer {
14+
z-index: 99999;
15+
position: relative;
16+
}
17+
18+
.popupClose {
19+
background-color: #fff;
20+
border-radius: 100px;
21+
position: absolute;
22+
top: -2rem;
23+
right: 117rem;
24+
z-index: 999;
25+
}
26+
1527
.sidePopup {
1628
background: #ffffff;
1729
border-radius: 4px;
1830
position: fixed;
19-
right: 0;
31+
right: 2rem;
2032
bottom: 0;
2133
top: 13rem;
22-
height: 800px;
23-
// height: 677px;
24-
min-width: 700px;
25-
overflow-x: auto;
34+
height: 88rem;
35+
min-width: 60vw;
36+
overflow: auto;
2637
}
2738

2839
@media (max-width: $md-breakpoint) {
@@ -32,27 +43,9 @@
3243
}
3344
}
3445

35-
.popupContainer {
36-
position: fixed;
37-
height: 100vh;
38-
width: 100vw;
39-
top: 0;
40-
left: 0;
41-
z-index: 99999;
42-
}
43-
44-
.popupClose {
45-
background-color: #fff;
46-
border-radius: 100px;
47-
position: absolute;
48-
top: 15rem;
49-
right: 70rem;
50-
z-index: 999;
51-
}
52-
53-
.actionSection {
54-
min-width: 683px;
55-
background-color: white;
46+
.actionSection {
47+
width: 60vw;
48+
background-color: #ffffff;
5649
position: fixed;
5750
bottom: 0;
5851
}

src/ui/layouts/common/SidePopup/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ export const SidePopup: React.FC<{
3939

4040
<Box className={styles.sidePopup}>
4141
<OutsideClickHandler onOutsideClick={onClose}>
42-
<Box paddingLeft="md" paddingTop="sm">
42+
<Box paddingTop="sm">
4343
<iframe
4444
title="ZenML - Organization Embed"
4545
style={{ border: '0px', height: '100vh', width: '100%' }}

src/ui/layouts/stackComponents/ConfigureComponent/SidePopup/index.module.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
bottom: 0;
1919
top: 13rem;
2020
height: 88rem;
21-
min-width: 45vw;
21+
min-width: 60vw;
2222
overflow: auto;
2323
}
2424

@@ -30,7 +30,7 @@
3030
}
3131

3232
.actionSection {
33-
width: 100%;
33+
width: 60vw;
3434
background-color: #ffffff;
3535
position: fixed;
3636
bottom: 0;

src/ui/layouts/stacks/CreateStack/ListForAll/SidePopup/index.module.scss

Lines changed: 14 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -3,26 +3,28 @@
33
.dimmer {
44
position: fixed;
55
backdrop-filter: blur(4px);
6-
// background: #424240;
7-
// opacity: 0.5;
86
height: 100vh;
97
width: 100vw;
108
top: 0;
119
left: 0;
1210
z-index: 9999;
1311
}
1412

13+
.popupContainer {
14+
z-index: 99999;
15+
position: relative;
16+
}
17+
1518
.sidePopup {
1619
background: #ffffff;
1720
border-radius: 4px;
1821
position: fixed;
19-
right: 0;
22+
right: 2rem;
2023
bottom: 0;
2124
top: 13rem;
22-
height: 800px;
23-
// height: 677px;
24-
min-width: 700px;
25-
overflow-x: auto;
25+
height: 88rem;
26+
min-width: 60vw;
27+
overflow: auto;
2628
}
2729

2830
@media (max-width: $md-breakpoint) {
@@ -32,26 +34,17 @@
3234
}
3335
}
3436

35-
.popupContainer {
36-
position: fixed;
37-
height: 100vh;
38-
width: 100vw;
39-
top: 0;
40-
left: 0;
41-
z-index: 99999;
42-
}
43-
4437
.popupClose {
4538
background-color: #fff;
4639
border-radius: 100px;
47-
position: absolute;
48-
top: 15rem;
49-
right: 70rem;
50-
z-index: 999;
40+
position: fixed;
41+
top: 17rem;
42+
right: 103rem;
43+
z-index: 99999999999;
5144
}
5245

5346
.actionSection {
54-
min-width: 683px;
47+
width: 60vw;
5548
background-color: white;
5649
position: fixed;
5750
bottom: 0;

0 commit comments

Comments
 (0)