Skip to content

Commit 677e644

Browse files
luizrrodriguesluizrrodrigues
authored
Merge pull request #4998 from topcoder-platform/milestone-20200917
Smoke Testing 2020-09-24
2 parents 1f47d91 + 6c6df9e commit 677e644

File tree

4 files changed

+232
-111
lines changed

4 files changed

+232
-111
lines changed

‎.circleci/config.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@ workflows:
245245
filters:
246246
branches:
247247
only:
248-
- community-app-tests-poc
248+
- milestone-20200917
249249
- develop
250250
# This is beta env for production soft releases
251251
- "build-prod-beta":

‎package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@
137137
"tc-accounts": "git+https://github.com/appirio-tech/accounts-app.git#dev",
138138
"tc-core-library-js": "github:appirio-tech/tc-core-library-js#v2.6.3",
139139
"tc-ui": "^1.0.12",
140-
"topcoder-react-lib": "1.0.5",
140+
"topcoder-react-lib": "1000.22.10",
141141
"topcoder-react-ui-kit": "2.0.1",
142142
"topcoder-react-utils": "0.7.8",
143143
"turndown": "^4.0.2",

‎src/shared/components/challenge-detail/Specification/styles.scss

+223-109
Original file line numberDiff line numberDiff line change
@@ -68,115 +68,6 @@ $tc-link-visited: #0c4e98;
6868
max-width: 10px !important;
6969
}
7070

71-
.challenge-details-view {
72-
white-space: normal;
73-
display: flex;
74-
flex-wrap: wrap;
75-
justify-content: center;
76-
overflow: hidden;
77-
position: relative;
78-
align-items: baseline;
79-
word-break: break-word;
80-
81-
@include linkStyle;
82-
83-
@include xs-to-sm {
84-
flex-direction: column;
85-
}
86-
87-
.challenge-specifications {
88-
@include roboto-regular;
89-
90-
flex: 4;
91-
text-align: left;
92-
display: flex;
93-
flex-direction: column;
94-
margin: 5px 0 50px;
95-
96-
.challenge-specs-develop {
97-
blockquote {
98-
border-left: 3px solid $tc-green;
99-
padding-left: 17px;
100-
}
101-
}
102-
103-
.challenge-specs-datasci {
104-
blockquote {
105-
border-left: 3px solid $tc-orange;
106-
padding-left: 17px;
107-
}
108-
}
109-
110-
.challenge-specs-design {
111-
blockquote {
112-
border-left: 3px solid $tc-light-blue;
113-
padding-left: 17px;
114-
}
115-
}
116-
117-
img {
118-
max-width: 100%;
119-
}
120-
}
121-
}
122-
123-
h2 {
124-
@include roboto-bold;
125-
126-
font-size: 20px;
127-
color: $tc-black;
128-
line-height: 30px;
129-
margin: (6 * $base-unit) 0 (2 * $base-unit);
130-
}
131-
132-
h3 {
133-
@include roboto-bold;
134-
135-
font-size: 15px;
136-
color: $tc-black;
137-
line-height: 25px;
138-
margin: (5 * $base-unit) 0 0;
139-
text-transform: uppercase;
140-
}
141-
142-
p,
143-
em,
144-
strong {
145-
@include roboto-regular;
146-
147-
font-size: 15px;
148-
color: $tc-gray-90;
149-
line-height: 25px;
150-
}
151-
152-
p {
153-
@include roboto-regular;
154-
155-
font-size: 15px;
156-
color: $tc-gray-90;
157-
line-height: 25px;
158-
159-
@include linkStyle;
160-
161-
margin: (2 * $base-unit) 0 (3 * $base-unit);
162-
}
163-
164-
ul {
165-
@include roboto-regular;
166-
167-
margin: 0 0 5px 20px;
168-
font-size: 15px;
169-
color: $tc-gray-90;
170-
line-height: 25px;
171-
list-style: disc outside none;
172-
173-
li {
174-
font-weight: 400;
175-
176-
@include linkStyle;
177-
}
178-
}
179-
18071
.rawHtml {
18172
@include tc-typography;
18273

@@ -304,6 +195,229 @@ ul {
304195
@include linkStyle;
305196
}
306197

198+
.challenge-details-view {
199+
white-space: normal;
200+
display: flex;
201+
flex-wrap: wrap;
202+
justify-content: center;
203+
overflow: hidden;
204+
position: relative;
205+
align-items: baseline;
206+
word-break: break-word;
207+
208+
@include linkStyle;
209+
210+
@include xs-to-sm {
211+
flex-direction: column;
212+
}
213+
214+
.challenge-specifications {
215+
@include roboto-regular;
216+
217+
flex: 4;
218+
text-align: left;
219+
display: flex;
220+
flex-direction: column;
221+
margin: 5px 0 50px;
222+
223+
.challenge-specs-develop {
224+
blockquote {
225+
border-left: 3px solid $tc-green;
226+
padding-left: 17px;
227+
}
228+
}
229+
230+
.challenge-specs-datasci {
231+
blockquote {
232+
border-left: 3px solid $tc-orange;
233+
padding-left: 17px;
234+
}
235+
}
236+
237+
.challenge-specs-design {
238+
blockquote {
239+
border-left: 3px solid $tc-light-blue;
240+
padding-left: 17px;
241+
}
242+
}
243+
244+
h1 {
245+
@include roboto-bold;
246+
247+
font-size: 28px;
248+
color: #151516;
249+
letter-spacing: -0.78px;
250+
line-height: 40px;
251+
margin: (10 * $base-unit) 0 (2 * $base-unit);
252+
}
253+
254+
h2 {
255+
@include roboto-bold;
256+
257+
font-size: 20px;
258+
color: $tc-black;
259+
line-height: 30px;
260+
margin: (6 * $base-unit) 0 (2 * $base-unit);
261+
}
262+
263+
h3 {
264+
@include roboto-bold;
265+
266+
font-size: 15px;
267+
color: $tc-black;
268+
line-height: 25px;
269+
margin: (5 * $base-unit) 0 0;
270+
text-transform: uppercase;
271+
}
272+
273+
h4 {
274+
@include roboto-bold;
275+
276+
margin: (4 * $base-unit) 0 (2 * $base-unit);
277+
font-size: 15px;
278+
line-height: 25px;
279+
color: $tc-gray-90;
280+
}
281+
282+
h5,
283+
h6 {
284+
margin: (4 * $base-unit) 0 (2 * $base-unit);
285+
}
286+
287+
p,
288+
em,
289+
strong {
290+
@include roboto-regular;
291+
292+
font-size: 15px;
293+
color: $tc-gray-90;
294+
line-height: 25px;
295+
}
296+
297+
p {
298+
@include roboto-regular;
299+
300+
font-size: 15px;
301+
color: $tc-gray-90;
302+
line-height: 25px;
303+
304+
@include linkStyle;
305+
306+
margin: (2 * $base-unit) 0 (3 * $base-unit);
307+
}
308+
309+
ul {
310+
@include roboto-regular;
311+
312+
margin: 0 0 5px 20px;
313+
font-size: 15px;
314+
color: $tc-gray-90;
315+
line-height: 25px;
316+
list-style: disc outside none;
317+
318+
li {
319+
font-weight: 400;
320+
321+
@include linkStyle;
322+
}
323+
}
324+
325+
em {
326+
@include roboto-regular;
327+
328+
font-style: italic;
329+
font-weight: 400;
330+
font-size: 15px;
331+
color: $tc-gray-90;
332+
line-height: 25px;
333+
}
334+
335+
ol {
336+
@include roboto-regular;
337+
338+
color: $tc-gray-80;
339+
font-size: 15px;
340+
line-height: 25px;
341+
list-style-type: decimal;
342+
margin: 0 0 5px;
343+
counter-reset: item;
344+
display: table;
345+
346+
li {
347+
list-style-type: none;
348+
font-weight: 400;
349+
counter-increment: item;
350+
display: table-row;
351+
white-space: normal;
352+
353+
&::before {
354+
display: table-cell;
355+
font-weight: 700;
356+
text-align: right;
357+
content: counter(item) ".";
358+
padding: 0 10px 0 0;
359+
}
360+
}
361+
}
362+
363+
td,
364+
th {
365+
@include roboto-regular;
366+
367+
color: $tc-gray-80;
368+
font-size: 15px;
369+
line-height: 25px;
370+
}
371+
372+
img {
373+
max-width: 100%;
374+
}
375+
376+
code {
377+
white-space: pre;
378+
margin: 10px 0 15px;
379+
background: $tc-gray-neutral-light;
380+
border: 1px solid silver;
381+
border-radius: 6px;
382+
font-family: Roboto Mono, monospace;
383+
font-weight: 400;
384+
font-size: 13px;
385+
color: $tc-black;
386+
line-height: 20px;
387+
padding: 15px;
388+
display: block;
389+
}
390+
391+
sub {
392+
font-size: 75%;
393+
line-height: 0;
394+
position: relative;
395+
vertical-align: baseline;
396+
bottom: -0.25em;
397+
}
398+
399+
sup {
400+
font-size: 75%;
401+
line-height: 0;
402+
position: relative;
403+
vertical-align: baseline;
404+
top: -0.5em;
405+
}
406+
407+
strong {
408+
@include roboto-bold;
409+
410+
font-size: 15px;
411+
color: $tc-gray-90;
412+
line-height: 25px;
413+
}
414+
415+
pre {
416+
overflow-x: scroll;
417+
}
418+
}
419+
}
420+
307421
.challenge-specs-main {
308422
@include roboto-regular;
309423

‎src/shared/containers/terms-detail/index.jsx

+7
Original file line numberDiff line numberDiff line change
@@ -70,9 +70,15 @@ class TermsDetailPageContainer extends React.Component {
7070
agreeingTerm,
7171
agreeTermFailure,
7272
theme,
73+
history,
7374
} = this.props;
7475
const { termsAccepted, showModal } = this.state;
7576

77+
if (details && details.isLegacyTerm && !history.location.pathname.includes(details.id)) {
78+
const path = `/challenges/terms/detail/${details.id}`;
79+
history.push(path, history.state);
80+
}
81+
7682
return (
7783
<div className={theme['outer-container']}>
7884
{
@@ -196,6 +202,7 @@ TermsDetailPageContainer.propTypes = {
196202
'terms-title': PT.string.isRequired,
197203
modalMsg: PT.any,
198204
}).isRequired,
205+
history: PT.shape().isRequired,
199206
};
200207

201208
function mapStateToProps(state, props) {

0 commit comments

Comments
 (0)