Added travis.yml and node-sass

10 years ago · 6712935be2
11 changed files with 70 additions and 41 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,8 +1,9 @@
 .DS_Store
 .settings/
 .sass-cache/
-style/.sass-cache/
 .project
+npm-debug.log
+style/.sass-cache/
 grapes.sublime-project
 grapes.sublime-workspace

--- a/.travis.yml
+++ b/.travis.yml
@ -0,0 +1,3 @@
+language: node_js
+node_js:
+  - "0.7"
--- a/Gruntfile.js
+++ b/Gruntfile.js
@ -14,10 +14,10 @@ module.exports = function(grunt) {
  grunt.loadNpmTasks('grunt-contrib-concat');
  grunt.loadNpmTasks('grunt-contrib-watch');
  grunt.loadNpmTasks('grunt-contrib-clean');
-  grunt.loadNpmTasks('grunt-contrib-sass');
  grunt.loadNpmTasks('grunt-contrib-copy');
  grunt.loadNpmTasks('grunt-bowercopy');
  grunt.loadNpmTasks('grunt-mocha');
+  grunt.loadNpmTasks('grunt-sass');

  grunt.initConfig({
    appDir: appPath,
--- a/README.md
+++ b/README.md
@ -1,4 +1,4 @@
-# [GrapesJS](http://grapesjs.com)
+# [GrapesJS](http://grapesjs.com) [![Build Status](https://travis-ci.org/artf/grapesjs.svg?branch=master)](https://travis-ci.org/artf/grapesjs)

 <p align="center"><img src="http://grapesjs.com/img/grapesjs-demo-template2.jpg" alt="GrapesJS" width="500" align="center"/></p>

@ -105,7 +105,7 @@ var config = {
  container:          '',

  // Enable/Disable the possibility to copy (ctrl + c) and paste (ctrl + v) elements
-  copyPaste         : true,
+  copyPaste:          true,

  // Enable/Disable undo manager
  undoManager:        true,
@ -156,6 +156,17 @@ Tests are run by [PhantomJS](http://phantomjs.org/) using [Mocha](https://mochaj
 $ npm run test
 ```

+### Tech
+
+GrapesJS is built on top of this amazing open source projects:
+
+* [Backbone] - gives Backbone to web applications
+* [Backbone.Undo] - a simple Backbone undo-manager
+* [Keymaster] - keyboard shortcuts
+* [CodeMirror] - versatile text editor
+* [Spectrum] - no hassle colorpicker
+* [FontAwesome] - the iconic font and CSS framework
+

 ### Contributing

@ -164,4 +175,12 @@ Any kind of help is welcome. At the moment there is no generic guidelines so use

 ## License

-BSD 3-clause
+BSD 3-clause
+
+
+[Backbone]: <http://backbonejs.org/>
+[Backbone.Undo]: <http://backbone.undojs.com/>
+[Keymaster]: <https://github.com/madrobby/keymaster>
+[CodeMirror]: <http://codemirror.net/>
+[Spectrum]: <https://github.com/bgrins/spectrum>
+[FontAwesome]: <https://fortawesome.github.io/Font-Awesome/>
--- a/bower.json
+++ b/bower.json
@ -1,7 +1,7 @@
 {
  "name": "grapesjs",
  "description": "Open source Web Template Editor",
-  "version": "0.1.0",
+  "version": "0.1.1",
  "author": "Artur Arseniev",
  "homepage": "http://grapesjs.com",
  "main": [
--- a/dist/css/grapes.min.css
+++ b/dist/css/grapes.min.css
--- a/dist/grapes.min.js
+++ b/dist/grapes.min.js
--- a/package.json
+++ b/package.json
@ -1,7 +1,7 @@
 {
  "name": "grapesjs",
  "description": "Open source Web Template Editor",
-  "version": "0.1.0",
+  "version": "0.1.1",
  "author": "Artur Arseniev",
  "license": "BSD-3-Clause",
  "homepage": "http://grapesjs.com",
@ -16,6 +16,7 @@
  "devDependencies": {
    "grunt": "^0.4.5",
    "grunt-bowercopy": "^1.2.4",
+    "grunt-cli": "^0.1.13",
    "grunt-contrib-clean": "^0.7.0",
    "grunt-contrib-concat": "^0.5.1",
    "grunt-contrib-connect": "^0.11.2",
@ -23,10 +24,11 @@
    "grunt-contrib-cssmin": "^0.14.0",
    "grunt-contrib-jshint": "^0.12.0",
    "grunt-contrib-requirejs": "^0.4.4",
-    "grunt-contrib-sass": "^0.9.2",
    "grunt-contrib-uglify": "^0.11.0",
    "grunt-contrib-watch": "^0.6.1",
-    "grunt-mocha": "^0.4.15"
+    "grunt-mocha": "^0.4.15",
+    "grunt-sass": "^1.1.0",
+    "node-sass": "^3.4.2"
  },
  "keywords": [
    "wte",
@ -40,9 +42,9 @@
    "editor"
  ],
  "scripts": {
-    "postinstall": "node_modules/.bin/bower install --config.interactive=false",
-    "build": "node_modules/.bin/grunt build",
-    "test": "node_modules/.bin/grunt test",
-    "dev": "node_modules/.bin/grunt dev"
+    "postinstall": "node ./node_modules/bower/bin/bower install --config.interactive=false",
+    "build": "./node_modules/.bin/grunt build",
+    "test": "./node_modules/.bin/grunt test",
+    "dev": "./node_modules/.bin/grunt dev"
  }
 }
--- a/src/dom_components/main.js
+++ b/src/dom_components/main.js
@ -28,7 +28,6 @@ define(function(require) {

 		// If there is no components try to append defaults
 		if(!c.wrapper.components.length && c.defaults.length){
-			console.log('Set defaults');
 			c.wrapper.components = c.defaults;
 		}

--- a/styles/css/font-awesome.css
+++ b/styles/css/font-awesome.css
@ -11,9 +11,10 @@
  src: url("../fonts/fontawesome-webfont.eot?#iefix&v=4.5.0") format("embedded-opentype"), url("../fonts/fontawesome-webfont.woff2?v=4.5.0") format("woff2"), url("../fonts/fontawesome-webfont.woff?v=4.5.0") format("woff"), url("../fonts/fontawesome-webfont.ttf?v=4.5.0") format("truetype"), url("../fonts/fontawesome-webfont.svg?v=4.5.0#fontawesomeregular") format("svg");
  font-weight: normal;
  font-style: normal; }
+
 .fa {
  display: inline-block;
-  font: normal normal normal 14px/1 FontAwesome;
+  font: normal normal normal 14px / 1 FontAwesome;
  font-size: inherit;
  text-rendering: auto;
  -webkit-font-smoothing: antialiased;
@ -21,7 +22,7 @@

 /* makes the font 33% larger relative to the icon container */
 .fa-lg {
-  font-size: 1.33333em;
+  font-size: 1.3333333333em;
  line-height: 0.75em;
  vertical-align: -15%; }

@ -38,24 +39,24 @@
  font-size: 5em; }

 .fa-fw {
-  width: 1.28571em;
+  width: 1.2857142857em;
  text-align: center; }

 .fa-ul {
  padding-left: 0;
-  margin-left: 2.14286em;
+  margin-left: 2.1428571429em;
  list-style-type: none; }
  .fa-ul > li {
    position: relative; }

 .fa-li {
  position: absolute;
-  left: -2.14286em;
-  width: 2.14286em;
-  top: 0.14286em;
+  left: -2.1428571429em;
+  width: 2.1428571429em;
+  top: 0.1428571429em;
  text-align: center; }
  .fa-li.fa-lg {
-    left: -1.85714em; }
+    left: -1.8571428571em; }

 .fa-border {
  padding: .2em .25em .15em;
@ -70,6 +71,7 @@

 .fa.fa-pull-left {
  margin-right: .3em; }
+
 .fa.fa-pull-right {
  margin-left: .3em; }

@ -82,6 +84,7 @@

 .fa.pull-left {
  margin-right: .3em; }
+
 .fa.pull-right {
  margin-left: .3em; }

@ -100,6 +103,7 @@
  100% {
    -webkit-transform: rotate(359deg);
    transform: rotate(359deg); } }
+
@keyframes fa-spin {
  0% {
    -webkit-transform: rotate(0deg);
@ -107,6 +111,7 @@
  100% {
    -webkit-transform: rotate(359deg);
    transform: rotate(359deg); } }
+
 .fa-rotate-90 {
  filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=1);
  -webkit-transform: rotate(90deg);
@ -2072,5 +2077,3 @@

 .fa-percent:before {
  content: ""; }
-
-/*# sourceMappingURL=font-awesome.css.map */
--- a/styles/css/main.css
+++ b/styles/css/main.css
@ -211,12 +211,11 @@ License: MIT
@media (max-device-width: 480px) {
  .sp-color {
    right: 40%; }
-
  .sp-hue {
    left: 63%; }
-
  .sp-fill {
    padding-top: 60%; } }
+
 .sp-dragger {
  border-radius: 5px;
  height: 5px;
@ -491,9 +490,10 @@ See http://bgrins.github.io/spectrum/themes/ for instructions.
  src: url("../fonts/fontawesome-webfont.eot?#iefix&v=4.5.0") format("embedded-opentype"), url("../fonts/fontawesome-webfont.woff2?v=4.5.0") format("woff2"), url("../fonts/fontawesome-webfont.woff?v=4.5.0") format("woff"), url("../fonts/fontawesome-webfont.ttf?v=4.5.0") format("truetype"), url("../fonts/fontawesome-webfont.svg?v=4.5.0#fontawesomeregular") format("svg");
  font-weight: normal;
  font-style: normal; }
+
 .fa {
  display: inline-block;
-  font: normal normal normal 14px/1 FontAwesome;
+  font: normal normal normal 14px / 1 FontAwesome;
  font-size: inherit;
  text-rendering: auto;
  -webkit-font-smoothing: antialiased;
@ -501,7 +501,7 @@ See http://bgrins.github.io/spectrum/themes/ for instructions.

 /* makes the font 33% larger relative to the icon container */
 .fa-lg {
-  font-size: 1.33333em;
+  font-size: 1.3333333333em;
  line-height: 0.75em;
  vertical-align: -15%; }

@ -518,24 +518,24 @@ See http://bgrins.github.io/spectrum/themes/ for instructions.
  font-size: 5em; }

 .fa-fw {
-  width: 1.28571em;
+  width: 1.2857142857em;
  text-align: center; }

 .fa-ul {
  padding-left: 0;
-  margin-left: 2.14286em;
+  margin-left: 2.1428571429em;
  list-style-type: none; }
  .fa-ul > li {
    position: relative; }

 .fa-li {
  position: absolute;
-  left: -2.14286em;
-  width: 2.14286em;
-  top: 0.14286em;
+  left: -2.1428571429em;
+  width: 2.1428571429em;
+  top: 0.1428571429em;
  text-align: center; }
  .fa-li.fa-lg {
-    left: -1.85714em; }
+    left: -1.8571428571em; }

 .fa-border {
  padding: .2em .25em .15em;
@ -550,6 +550,7 @@ See http://bgrins.github.io/spectrum/themes/ for instructions.

 .fa.fa-pull-left {
  margin-right: .3em; }
+
 .fa.fa-pull-right {
  margin-left: .3em; }

@ -562,6 +563,7 @@ See http://bgrins.github.io/spectrum/themes/ for instructions.

 .fa.pull-left {
  margin-right: .3em; }
+
 .fa.pull-right {
  margin-left: .3em; }

@ -580,6 +582,7 @@ See http://bgrins.github.io/spectrum/themes/ for instructions.
  100% {
    -webkit-transform: rotate(359deg);
    transform: rotate(359deg); } }
+
@keyframes fa-spin {
  0% {
    -webkit-transform: rotate(0deg);
@ -587,6 +590,7 @@ See http://bgrins.github.io/spectrum/themes/ for instructions.
  100% {
    -webkit-transform: rotate(359deg);
    transform: rotate(359deg); } }
+
 .fa-rotate-90 {
  filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=1);
  -webkit-transform: rotate(90deg);
@ -2816,7 +2820,7 @@ ol.example li.placeholder:before {
    background-color: rgba(0, 0, 0, 0.3); }
  .wte-nv-navigator .wte-nv-item.wte-nv-hide {
    opacity: 0.55;
-    filter: alpha(opacity=55.0); }
+    filter: alpha(opacity=55); }
  .wte-nv-navigator .wte-nv-item #wte-nv-counter {
    font-size: 10px;
    position: absolute;
@ -2903,7 +2907,7 @@ ol.example li.placeholder:before {
  outline: 3px solid #ffca6f;
  outline-offset: -3px;
  text-align: center;
-  font-size: 16.66667px;
+  font-size: 16.6666666667px;
  cursor: pointer; }
  .wte-comp-image-placeholder.fa-picture-o::after {
    content: "\f03e"; }
@ -3432,5 +3436,3 @@ ol.example li.placeholder:before {
  text-shadow: none;
  box-shadow: none;
  padding: 3px 5px; }
-
-/*# sourceMappingURL=main.css.map */