Skip to content

Commit eefd933

Browse files
author
Vikas Agarwal
committed
Merge branch 'dev' into feature/second-level-project-category-performance
# Conflicts: # src/config/projectQuestions/real_world_testing.v1.0.js
2 parents 14b3c48 + ba83087 commit eefd933

File tree

5 files changed

+56
-30
lines changed

5 files changed

+56
-30
lines changed

src/components/FileList/AddFiles.scss

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22

33
.add-file {
44
position: relative;
5-
5+
margin-top: 10px;
6+
67
.tc-btn {
78
position: absolute;
89
bottom: $base-unit*4;

src/components/FileList/FileList.scss

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@
55
border: none;
66
box-shadow: none;
77

8+
&.panel {
9+
padding: 0;
10+
}
11+
812
> h4 {
913
@include roboto-medium;
1014
font-size: 15px;

src/config/projectQuestions/real_world_testing.v1.0.js

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -235,16 +235,16 @@ const sections = [
235235
icon: 'question',
236236
id: 'targetApplication.description',
237237
fieldName: 'details.targetApplication.description',
238-
description: 'Please describe your application.',
239-
title: '',
238+
description: '',
239+
title: 'Please describe your application.',
240240
type: 'textbox'
241241
},
242242
{
243243
icon: 'question',
244244
id: 'targetApplication.platform',
245245
fieldName: 'details.targetApplication.platform',
246-
description: 'Please list all platforms the application should be tested on.',
247-
title: '',
246+
description: '',
247+
title: 'Please list all platforms the application should be tested on.',
248248
type: 'textbox'
249249
},
250250
{
@@ -267,16 +267,16 @@ const sections = [
267267
icon: 'question',
268268
id: 'preferences.suggestions',
269269
fieldName: 'details.cyclePreferences.usabilitySuggestions',
270-
description: 'Would you like usability suggestions included in the issue report?',
271-
title: '',
270+
description: '',
271+
title: 'Would you like usability suggestions included in the issue report?',
272272
type: 'textbox'
273273
},
274274
{
275275
icon: 'question',
276276
id: 'preferences.omissions',
277277
fieldName: 'details.cyclePreferences.omissions',
278-
description: 'Are there any types of defects you would like ommitted from issue reports?',
279-
title: '',
278+
description: '',
279+
title: 'Are there any types of defects you would like ommitted from issue reports?',
280280
type: 'textbox'
281281
}
282282
]

src/projects/detail/components/SpecQuestionList/SpecQuestionList.scss

Lines changed: 21 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,8 @@
44
}
55

66
.spec-question-list-item {
7-
display: flex;
8-
padding: 35px 0 15px;
9-
width: 100%;
7+
padding: 0;
8+
margin-bottom: 30px;
109

1110
.icon-col {
1211
padding-top: 3px;
@@ -18,11 +17,11 @@
1817
width: 100%;
1918

2019
> h5 {
21-
@include roboto-medium;
20+
@include roboto;
2221
font-size: 15px;
2322
line-height: 25px;
24-
color: $tc-gray-80;
25-
margin-bottom: 15px;
23+
color: $tc-gray-70;
24+
margin-bottom: 0;
2625

2726
span {
2827
color: $tc-orange;
@@ -43,32 +42,35 @@
4342
font-size: 15px;
4443
}
4544
}
45+
4646
.description {
4747
margin-bottom: $base-unit * 4;
4848
}
49+
4950
.child-component {
50-
margin-top: 10px;
51-
5251
.colorSelector {
5352
margin-bottom: $base-unit * 4;
5453
}
55-
.checkbox-group-item.checkbox-item-checked{
54+
55+
.checkbox-group-item.checkbox-item-checked {
5656
background: $tc-dark-blue-10;
5757
border-radius: 4px;
5858
}
59-
59+
6060
.dropdown-wrap.default {
6161
background: $tc-gray-neutral-light;
6262
border-color: $tc-gray-20;
6363
position: relative;
6464
width: 150px;
6565
left: 170px;
6666
margin-top: -45px;
67+
6768
&:after {
6869
border-bottom-color: $tc-gray-70;
6970
border-right-color: $tc-gray-70;
7071
}
7172
}
73+
7274
textarea {
7375
min-height: 45px;
7476
max-width: 100%;
@@ -77,13 +79,20 @@
7779
margin-bottom: 0;
7880
line-height: 25px;
7981
}
82+
83+
.radio-group-input,
8084
.checkbox-group-item {
8185
width: 100%;
82-
padding: 12px 10px;
86+
padding: 15px 0;
8387
margin-bottom: 20px;
8488
margin-right: 0;
89+
}
90+
91+
.checkbox-group-item {
8592
border-radius: 4px;
8693
background: $tc-gray-neutral-light;
94+
padding-left: 10px;
95+
8796
label {
8897
font-weight: 400;
8998
color: $tc-black;
@@ -95,7 +104,7 @@
95104
width: auto;
96105
background: none;
97106
padding: 0;
98-
margin-right: 30px;
107+
margin: 15px 30px 15px 0;
99108
}
100109
}
101110
}

src/projects/detail/containers/Specification.scss

Lines changed: 21 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ $sideBarWidth: 280px;
150150
}
151151

152152
.sub-title {
153-
margin: 50px 0 20px;
153+
margin: 30px 0 10px;
154154

155155
.title {
156156
font-size: 15px;
@@ -340,6 +340,8 @@ $sideBarWidth: 280px;
340340

341341
/* .section-features-module */
342342
.section-features-module {
343+
margin-top: 20px;
344+
343345
&.open {
344346
.content-boxes {
345347
display: block;
@@ -351,6 +353,10 @@ $sideBarWidth: 280px;
351353
}
352354
}
353355

356+
.row {
357+
margin-bottom: 5px;
358+
}
359+
354360
.bg-contents {
355361
@include roboto-medium;
356362
font-size: 15px;
@@ -380,8 +386,7 @@ $sideBarWidth: 280px;
380386
max-width: 100%;
381387
text-align: left;
382388
text-indent: 0;
383-
margin-bottom: 20px;
384-
resize: vertical;
389+
resize: none;
385390
overflow: auto;
386391
}
387392
}
@@ -833,29 +838,38 @@ $sideBarWidth: 280px;
833838
.project-name-section {
834839
display: flex;
835840
align-items: flex-start;
841+
margin-bottom: 20px;
836842

837843
.dashed-bottom-border,
838844
.editable-project-name {
839845
flex: 1;
846+
height: 40px;
847+
border-bottom: 1px dashed $tc-gray-20;
840848

841849
.project-name {
842850
word-break: break-all;
851+
font-size: 20px;
852+
margin-top: 10px;
843853
}
844854
}
845855

846856
.read-only-refcode {
847-
height: 100%;
857+
height: 40px;
848858
align-self: flex-end;
849-
border-bottom: 1px solid $tc-gray-40;
850-
padding: 0px 2 * $base-unit;
859+
border-bottom: 1px solid $tc-gray-20;
860+
padding: 10px;
851861
position: relative;
862+
margin-left: 20px;
852863

853864
.refcode-desc {
854865
@include roboto;
855866
font-size: 13px;
856-
color: #5d5d66;
867+
color: $tc-gray-30;
857868
position: absolute;
858869
bottom: -20px;
870+
left: 0;
871+
width: 100%;
872+
text-align: center;
859873
font-style: italic;
860874
white-space: nowrap;
861875
}
@@ -878,8 +892,6 @@ $sideBarWidth: 280px;
878892
}
879893

880894
.project-refcode {
881-
width: 100%;
882-
height: 100%;
883895
}
884896
}
885897
}

0 commit comments

Comments
 (0)