Skip to content

Commit c4be137

Browse files
Merge branch 'dev' into QA-Fixes
2 parents 327e3d0 + bc6939b commit c4be137

File tree

15 files changed

+91
-75
lines changed

15 files changed

+91
-75
lines changed

src/ui/layouts/NonEditableConfig/index.tsx

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,10 @@ export const NonEditableConfig: React.FC<{ details: any }> = ({ details }) => {
165165
>
166166
<FlexBox.Row>
167167
<Box
168-
style={{ display: 'flex', alignItems: 'center' }}
168+
style={{
169+
display: 'flex',
170+
alignItems: 'center',
171+
}}
169172
marginTop="sm"
170173
>
171174
<div
@@ -249,7 +252,11 @@ export const NonEditableConfig: React.FC<{ details: any }> = ({ details }) => {
249252
{Object.entries(elementSchema).map(([key, value], index) => (
250253
<FlexBox.Row>
251254
<Box
252-
style={{ display: 'flex', alignItems: 'center' }}
255+
style={{
256+
display: 'flex',
257+
alignItems: 'center',
258+
width: '29.8vw',
259+
}}
253260
marginTop="sm"
254261
>
255262
<div
@@ -363,7 +370,7 @@ export const NonEditableConfig: React.FC<{ details: any }> = ({ details }) => {
363370
&#x27A4;
364371
</div>
365372

366-
<div className="form-group" style={{ width: '28vw' }}>
373+
<div className="form-group" style={{ width: '28.3vw' }}>
367374
<EditField
368375
disabled
369376
className={styles.field}

src/ui/layouts/common/layouts/AuthenticatedLayout/AuthenticatedSidebar/SideFooter/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ export const SideFooter: React.FC = () => {
1212
<Separator.LightNew />
1313
</Box>
1414

15-
<div style={{ marginBottom: '-11px' }}>
15+
<div style={{ marginBottom: '-11px', marginLeft: '-3.5px' }}>
1616
{/* <MenuItemExternal
1717
id="documentation"
1818
Icon={() => <icons.docs color={iconColors.white} size={iconSizes.md} />}

src/ui/layouts/pipelines/Header/index.module.scss

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,19 @@
66
box-shadow: 0px 4px 20px -2px rgba(0, 0, 0, 0.03);
77
}
88

9-
.iconStyle {
10-
background-color: #F4F4F4;
9+
.header2 {
10+
padding-bottom: 40px !important;
11+
box-shadow: 0px 4px 20px -2px rgba(0, 0, 0, 0.03) !important;
12+
}
13+
14+
.iconStyle {
15+
background-color: #f4f4f4;
1116
text-align: center;
12-
height: 35px;
17+
height: 35px;
1318
width: 40px;
1419
border-radius: 3px;
1520
cursor: pointer;
16-
}
21+
}
1722

1823
@media (max-width: $md-breakpoint) {
1924
.dynamicHeaderRight {

src/ui/layouts/pipelines/Header/index.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,10 @@ const HeaderWithButtons: React.FC<{
5757
renderRight?: () => JSX.Element;
5858
}> = ({ breadcrumbs, renderRight, title }) => (
5959
<FlexBox
60+
marginTop="xl"
6061
alignItems="center"
6162
justifyContent="space-between"
62-
className={styles.header}
63+
className={styles.header2}
6364
>
6465
<FlexBox className="d-none d-md-flex">
6566
<Paragraph

src/ui/layouts/runs/Header/index.module.scss

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@
66
box-shadow: 0px 4px 20px -2px rgba(0, 0, 0, 0.03);
77
}
88

9-
.iconStyle {
10-
background-color: #F4F4F4;
9+
.iconStyle {
10+
background-color: #f4f4f4;
1111
text-align: center;
12-
height: 35px;
12+
height: 35px;
1313
width: 40px;
1414
border-radius: 3px;
1515
cursor: pointer;
16-
}
16+
}
1717

1818
@media (max-width: $md-breakpoint) {
1919
.dynamicHeaderRight {

src/ui/layouts/secrets/RegisterSecret/Register/index.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,7 @@ export const Register: React.FC<Props> = (state: any) => {
260260
/>
261261
</Box> */}
262262

263-
<Box style={{ width: '329px' }}>
263+
<Box style={{ width: '30vw' }}>
264264
<FormTextField
265265
required={true}
266266
label={'Secret name'}
@@ -270,7 +270,7 @@ export const Register: React.FC<Props> = (state: any) => {
270270
onChange={(val: string) => setSecretName(val)}
271271
/>
272272
</Box>
273-
<Box marginTop="lg" style={{ width: '329px' }}>
273+
<Box marginTop="lg" style={{ width: '30vw' }}>
274274
<FormDropdownField
275275
label={'Scope'}
276276
labelColor="rgba(66, 66, 64, 0.5)"

src/ui/layouts/stackComponents/ConfigureComponent/CreateComponent/index.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -326,7 +326,7 @@ export const CreateComponent: React.FC<{ flavor: any; state: any }> = ({
326326
<Box
327327
className="form-group"
328328
marginRight="md"
329-
style={{ width: '185px' }}
329+
style={{ width: '13.75vw' }}
330330
>
331331
<FormTextField
332332
onChange={(event: any) =>
@@ -344,7 +344,7 @@ export const CreateComponent: React.FC<{ flavor: any; state: any }> = ({
344344
/>
345345
</Box>
346346

347-
<Box className="form-group" style={{ width: '185px' }}>
347+
<Box className="form-group" style={{ width: '13.75vw' }}>
348348
<FormTextField
349349
onChange={(event: any) =>
350350
handleInputChange(

src/ui/layouts/stackComponents/Header/index.module.scss

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,19 @@
77
box-shadow: 0px 4px 20px -2px rgba(0, 0, 0, 0.03);
88
}
99

10-
.iconStyle {
11-
background-color: #F4F4F4;
10+
.header2 {
11+
padding-bottom: 40px !important;
12+
box-shadow: 0px 4px 20px -2px rgba(0, 0, 0, 0.03) !important;
13+
}
14+
15+
.iconStyle {
16+
background-color: #f4f4f4;
1217
text-align: center;
13-
height: 35px;
18+
height: 35px;
1419
width: 40px;
1520
border-radius: 3px;
1621
cursor: pointer;
17-
}
18-
22+
}
1923

2024
@media (max-width: $md-breakpoint) {
2125
// .dynamicHeaderRight {

src/ui/layouts/stackComponents/Header/index.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,11 @@ const HeaderWithButtons: React.FC<{
5959
renderRight?: () => JSX.Element;
6060
}> = ({ breadcrumbs, renderRight, title }) => (
6161
<FlexBox.Row
62+
marginTop="xl"
6263
alignItems="center"
6364
justifyContent="space-between"
6465
fullWidth
65-
className={styles.header}
66+
className={styles.header2}
6667
>
6768
<FlexBox className="d-none d-md-flex">
6869
<Paragraph
Lines changed: 33 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
@import '../../../../globalStyles.scss';
22

3-
43
// .list::-webkit-scrollbar {
5-
// height: 11px;
4+
// height: 11px;
65
// }
7-
6+
87
// /* Handle */
98
// .list::-webkit-scrollbar-thumb {
10-
// background: rgba(168, 168, 168, 0.5);
9+
// background: rgba(168, 168, 168, 0.5);
1110
// border-radius: 6px;
1211
// }
1312

@@ -16,9 +15,6 @@
1615
// background: rgba(217, 217, 217, 0.5);
1716
// border-radius: 6px;
1817
// }
19-
20-
21-
2218

2319
.top {
2420
position: -webkit-sticky;
@@ -27,47 +23,45 @@
2723
padding: 10px 0;
2824
background-color: #fff;
2925
z-index: 98;
30-
26+
margin-top: -30px;
3127
}
3228

3329
.selectedBox {
34-
height: 60px;
35-
width: 60px;
36-
background-color: #fff;
37-
box-shadow: 0px 4px 20px rgba(0, 0, 0, 0.05);
38-
cursor: pointer;
39-
border-radius: 6px;
40-
position: relative;
30+
height: 60px;
31+
width: 60px;
32+
background-color: #fff;
33+
box-shadow: 0px 4px 20px rgba(0, 0, 0, 0.05);
34+
cursor: pointer;
35+
border-radius: 6px;
36+
position: relative;
4137

42-
img {
43-
padding: 7px 3px;
44-
height: 100%;
45-
width: 100%;
46-
object-fit: contain
47-
}
38+
img {
39+
padding: 7px 3px;
40+
height: 100%;
41+
width: 100%;
42+
object-fit: contain;
43+
}
4844
}
4945

5046
.selectedBoxCheckbox {
51-
height: 15px;
52-
width: 15px;
53-
accent-color:green;
54-
position: absolute;
55-
top: 5px;
47+
height: 15px;
48+
width: 15px;
49+
accent-color: green;
50+
position: absolute;
51+
top: 5px;
5652
}
5753

58-
5954
.stackFooter {
60-
width: 100%;
61-
height: 74px;
62-
position: sticky;
63-
bottom: 0;
64-
background-color: #fff;
65-
background: #ffffff;
66-
display: flex;
67-
justify-content: flex-end;
55+
width: 100%;
56+
height: 74px;
57+
position: sticky;
58+
bottom: 0;
59+
background-color: #fff;
60+
background: #ffffff;
61+
display: flex;
62+
justify-content: flex-end;
6863
}
6964
.stackFooterButton {
70-
71-
right: 3rem;
72-
margin-right: 45px,
73-
}
65+
right: 3rem;
66+
margin-right: 45px;
67+
}

0 commit comments

Comments
 (0)