1
0
mirror of https://github.com/chinchang/web-maker.git synced 2025-07-29 09:40:10 +02:00

Merge branch 'master' into release-4.0

This commit is contained in:
Kushagra Gour
2018-10-26 11:38:39 +05:30
31 changed files with 216 additions and 273 deletions

View File

@@ -762,7 +762,9 @@ export default class ContentWrap extends Component {
'CodeMirror-linenumbers',
'CodeMirror-foldgutter'
],
emmet: true
emmet: true,
prettier: true,
prettierParser: 'css'
}}
prefs={this.props.prefs}
onChange={this.onCssCodeChange.bind(this)}
@@ -814,7 +816,9 @@ export default class ContentWrap extends Component {
'error-gutter',
'CodeMirror-linenumbers',
'CodeMirror-foldgutter'
]
],
prettier: true,
prettierParser: 'js'
}}
prefs={this.props.prefs}
autoComplete={this.props.prefs.autoComplete}