Skip to content

Commit 2f7ef12

Browse files
authored
Merge pull request #4306 from appirio-tech/revert-4302-issue-4298
Revert "fix: add easymde #4298"
2 parents 45c395a + e10d86a commit 2f7ef12

File tree

6 files changed

+22
-309
lines changed

6 files changed

+22
-309
lines changed

package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,6 @@
9696
"draft-js-mention-plugin": "^2.0.0-rc2",
9797
"draft-js-plugins-editor": "^2.0.0-rc2",
9898
"draft-js-utils": "^0.1.7",
99-
"easymde": "^2.14.0",
10099
"expression-evaluator": "git+https://github.com/topcoder-platform/expression-evaluator.git#dev",
101100
"fbemitter": "^2.1.1",
102101
"fbjs": "^0.8.12",

src/components/MarkdownText/MarkdownText.jsx

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

src/components/MarkdownText/MarkdownText.scss

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

src/index.jsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import _ from 'lodash'
66
import { render } from 'react-dom'
77
import { SEGMENT_KEY } from './config/constants'
88
import App from './App'
9-
import 'easymde/dist/easymde.min.css'
109

1110
import 'styles/main.scss'
1211

src/projects/detail/components/JobPickerRow/JobPickerRow.jsx

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import IconX from '../../../../assets/icons/ui-16px-1_bold-remove.svg'
66
import IconAdd from '../../../../assets/icons/ui-16px-1_bold-add.svg'
77
import SkillsQuestion from '../SkillsQuestion/SkillsQuestionBase'
88
import PositiveNumberInput from '../../../../components/PositiveNumberInput/PositiveNumberInput'
9-
import MarkdownText from '../../../../components/MarkdownText/MarkdownText'
109
import SelectDropdown from 'appirio-tech-react-components/components/SelectDropdown/SelectDropdown'
1110

1211
import styles from './JobPickerRow.scss'
@@ -74,8 +73,8 @@ class JobPickerRow extends React.PureComponent {
7473
this.props.onChange(this.props.rowIndex, 'role', evt)
7574
}
7675

77-
handleDescriptionChange(value) {
78-
this.props.onChange(this.props.rowIndex, 'description', value)
76+
handleDescriptionChange(evt) {
77+
this.props.onChange(this.props.rowIndex, 'description', evt.target.value)
7978
}
8079

8180
resetDuration() {
@@ -235,11 +234,13 @@ class JobPickerRow extends React.PureComponent {
235234
<label className="tc-label" styleName="label">
236235
Job Description
237236
</label>
238-
<div styleName={`job-description ${isRowIncomplete && !value.description.trim() ? 'error' : ''}`} >
239-
<MarkdownText
240-
value={value.description || ''}
237+
<div styleName="job-description">
238+
<textarea
239+
className={`job-textarea ${isRowIncomplete && !value.description.trim() ? 'error' : 'empty'}`}
241240
onChange={this.handleDescriptionChange}
242241
placeholder="Job Description"
242+
type="text"
243+
value={value.description || ''}
243244
/>
244245
</div>
245246
</div>

src/projects/detail/components/JobPickerRow/JobPickerRow.scss

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -86,15 +86,22 @@
8686
display: block;
8787
}
8888

89-
.job-description {
90-
&.error {
91-
:global {
92-
.CodeMirror {
93-
border:1px solid $tc-red-70;
94-
}
95-
}
89+
.job-description textarea,
90+
.job-textarea[type="text"] {
91+
&.empty {
92+
color: $tc-gray-30;
9693
}
97-
}
94+
min-height : 90px;
95+
96+
@include placeholder {
97+
@include roboto;
98+
color: $tc-gray-30;
99+
text-transform: none;
100+
font-style: italic;
101+
font-size: $base-unit*3;
102+
line-height: $base-unit*4;
103+
}
104+
}
98105
}
99106

100107
.col-role-container {

0 commit comments

Comments
 (0)