Skip to content

Commit 6012e9e

Browse files
author
vikasrohit
authored
Merge pull request #1124 from topcoder-platform/hotfix/confirm-design-challenge
[PROD] [HOTFIX] confirm design challenge
2 parents bc9fadd + 394787b commit 6012e9e

File tree

12 files changed

+77
-230
lines changed

12 files changed

+77
-230
lines changed

.circleci/config.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,6 @@ workflows:
8383
branches:
8484
only:
8585
- develop
86-
- feature/timeline-template
8786

8887
# Production builds are exectuted only on tagged commits to the
8988
# master branch.

config/constants/development.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ module.exports = {
3030
DES_TRACK_ID: '5fa04185-041f-49a6-bfd1-fe82533cd6c8',
3131
DS_TRACK_ID: 'c0f5d461-8219-4c14-878a-c3a3f356466d',
3232
QA_TRACK_ID: '36e6a8d0-7e1e-4608-a673-64279d99c115',
33+
CHALLENGE_TYPE_ID: '927abff4-7af9-4145-8ba1-577c16e64e2e',
3334
SEGMENT_API_KEY: 'QBtLgV8vCiuRX1lDikbMjcoe9aCHkF6n',
3435
CREATE_FORUM_TYPE_IDS: ['927abff4-7af9-4145-8ba1-577c16e64e2e', 'dc876fa4-ef2d-4eee-b701-b555fcc6544c'],
3536
FILE_PICKER_API_KEY: process.env.FILE_PICKER_API_KEY,

config/constants/production.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ module.exports = {
3030
DES_TRACK_ID: '5fa04185-041f-49a6-bfd1-fe82533cd6c8',
3131
DS_TRACK_ID: 'c0f5d461-8219-4c14-878a-c3a3f356466d',
3232
QA_TRACK_ID: '36e6a8d0-7e1e-4608-a673-64279d99c115',
33+
CHALLENGE_TYPE_ID: '927abff4-7af9-4145-8ba1-577c16e64e2e',
3334
SEGMENT_API_KEY: 'QSQAW5BWmZfLoKFNRgNKaqHvLDLJoGqF',
3435
CREATE_FORUM_TYPE_IDS: ['927abff4-7af9-4145-8ba1-577c16e64e2e', 'dc876fa4-ef2d-4eee-b701-b555fcc6544c'],
3536
FILE_PICKER_API_KEY: process.env.FILE_PICKER_API_KEY,

src/components/ChallengeEditor/ChallengeName-Field/ChallengeName-Field.module.scss

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -52,18 +52,16 @@
5252
}
5353
}
5454

55-
.challengeName {
56-
&::-moz-placeholder { /* Mozilla Firefox 19+ */
57-
line-height: 38px;
58-
color: $tc-gray-80;
59-
}
60-
&::-webkit-input-placeholder { /* Webkit */
61-
line-height: 38px;
62-
color: $tc-gray-80;
63-
}
64-
&:-ms-input-placeholder { /* IE */
65-
line-height: 38px;
66-
color: $tc-gray-80;
55+
@-moz-document url-prefix() {
56+
.challengeName {
57+
&::-moz-placeholder { /* Mozilla Firefox 19+ */
58+
line-height: 38px;
59+
}
60+
&::-webkit-input-placeholder { /* Webkit */
61+
line-height: 38px;
62+
}
63+
&:-ms-input-placeholder { /* IE */
64+
line-height: 38px;
65+
}
6766
}
6867
}
69-

src/components/ChallengeEditor/ChallengeView/index.js

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ import { isBetaMode } from '../../../util/cookie'
2626
import { loadGroupDetails } from '../../../actions/challenges'
2727
import Tooltip from '../../Tooltip'
2828
import { MESSAGE, REVIEW_TYPES } from '../../../config/constants'
29-
import TimelineTemplateField from '../TimelineTemplate-Field'
3029

3130
const ChallengeView = ({
3231
projectDetail,
@@ -201,13 +200,6 @@ const ChallengeView = ({
201200
{isBetaMode() && (
202201
<UseSchedulingAPIField challenge={challenge} readOnly />
203202
)}
204-
<TimelineTemplateField
205-
challengeTimelines={metadata.challengeTimelines}
206-
timelineTemplates={metadata.timelineTemplates}
207-
challenge={challenge}
208-
onUpdateSelect={() => {}}
209-
readOnly
210-
/>
211203
</>
212204
)}
213205
{

src/components/ChallengeEditor/TimelineTemplate-Field/TimelineTemplate-Field.module.scss

Lines changed: 0 additions & 55 deletions
This file was deleted.

src/components/ChallengeEditor/TimelineTemplate-Field/index.js

Lines changed: 0 additions & 126 deletions
This file was deleted.

0 commit comments

Comments
 (0)