Skip to content

Commit 2c8509c

Browse files
committed
Updates for #1140 and #1162
1 parent 9e67bc6 commit 2c8509c

File tree

4 files changed

+30
-15
lines changed

4 files changed

+30
-15
lines changed

src/components/ActionCard/Comment.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ class Comment extends React.Component {
3535

3636
edit() {
3737
this.setState({editMode: true})
38-
this.props.onChange(null,true)
38+
this.props.onChange(null, true)
3939
}
4040

4141
delete() {

src/components/Feed/draftjs.scss

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,9 +65,14 @@
6565
list-style-type: disc;
6666
}
6767
.public-DraftStyleDefault-pre {
68-
background: #ddd;
68+
background: #fafafb;
6969
padding: 10px;
70-
font-family: monospace;
70+
font-family: Roboto Mono, SF Mono, monospace;
71+
font-size: 13px;
72+
font-weight: normal;
73+
color: #333;
74+
border: 1px solid #ededf2;
75+
border-radius: 4px;
7176
}
7277
.public-DraftStyleDefault-block {
7378
white-space: pre-wrap;

src/components/RichTextArea/RichTextArea.jsx

Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,16 @@ const blockDndPlugin = createBlockDndPlugin()
2323
const decorator = composeDecorators(
2424
blockDndPlugin.decorator
2525
)
26-
const imagePlugin = createImagePlugin({ decorator })
27-
const plugins = [linkPlugin, handleDropPlugin, blockDndPlugin, imagePlugin, imageUploadPlugin]
26+
const allowImages = false
27+
const plugins = [linkPlugin, blockDndPlugin]
28+
if (allowImages){
29+
const imagePlugin = createImagePlugin({ decorator })
30+
plugins.push(handleDropPlugin)
31+
plugins.push(imagePlugin)
32+
plugins.push(imageUploadPlugin)
33+
}
34+
35+
2836

2937
const styles = [
3038
{className: 'bold', style: 'BOLD'},
@@ -298,12 +306,14 @@ class RichTextArea extends React.Component {
298306
active={currentEntity && 'LINK' === currentEntity.getType()}
299307
/>
300308
<div className="separator"/>
301-
<AddLinkButton
302-
type={'image'}
303-
getEditorState={this.getEditorState}
304-
setEditorState={this.setEditorState}
305-
disabled={disableForCodeBlock}
306-
/>
309+
{ allowImages &&
310+
<AddLinkButton
311+
type={'image'}
312+
getEditorState={this.getEditorState}
313+
setEditorState={this.setEditorState}
314+
disabled={disableForCodeBlock}
315+
/>
316+
}
307317
</div>
308318
<div className="tc-btns">
309319
{ editMode && !isCreating &&

src/components/TopBar/ProjectsToolBar.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -185,10 +185,10 @@ class ProjectsToolBar extends Component {
185185
closeModal={ this.hideCreateProjectDialog }
186186
userRoles={ userRoles }
187187
onProjectUpdate={ (updatedProject, dirty=true) => {
188-
this.setState({
189-
isProjectDirty: dirty
190-
})
191-
}
188+
this.setState({
189+
isProjectDirty: dirty
190+
})
191+
}
192192
}
193193
/>
194194
}

0 commit comments

Comments
 (0)