merge codemirror styles

9 years ago · a019780706
5 changed files with 6 additions and 7 deletions
--- a/dist/css/grapes.min.css
+++ b/dist/css/grapes.min.css
--- a/dist/grapes.min.js
+++ b/dist/grapes.min.js
--- a/index.html
+++ b/index.html
@ -3,9 +3,6 @@
  <head>
    <meta charset="utf-8">
    <title>GrapesJS</title>
    <link rel="stylesheet" href="node_modules/codemirror/lib/codemirror.css">
    <link rel="stylesheet" href="node_modules/codemirror/theme/hopscotch.css">
    <link rel="stylesheet" href="dist/css/grapes.min.css">
    <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
    <script src="dist/grapes.min.js"></script>
--- a/package.json
+++ b/package.json
@ -1,7 +1,7 @@
 {
  "name": "grapesjs",
  "description": "Free and Open Source Web Builder Framework",
-  "version": "0.7.3",
+  "version": "0.7.4",
  "author": "Artur Arseniev",
  "license": "BSD-3-Clause",
  "homepage": "http://grapesjs.com",
--- a/src/styles/scss/main.scss
+++ b/src/styles/scss/main.scss
@ -1,6 +1,8 @@
 /* stylelint-disable */
@import "spectrum";
@import "node_modules/font-awesome/scss/font-awesome";
@import "node_modules/codemirror/lib/codemirror";
@import "node_modules/codemirror/theme/hopscotch";
 $app-prefix: 	'gjs-';
 $nv-prefix: 	$app-prefix + 'nv-';