Merge branch 'develop'

Makefile

@@ -6,10 +6,10 @@ install:
 	bower install
 
 less: 
-	lessc less/style.less > css/style.css 
+	lessc less/style.less > css/style.css --compress
 
 css:
-	lessc less/style.less css/style.css --clean-css
+	make less
 
 server:
 	jekyll server --watch --baseurl= --trace

_config.yml

@@ -3,9 +3,8 @@ source:			.
 destination:	_gh-pages
 lsi:			false
 markdown:		rdiscount
-highlighter:	true
 permalink:		pretty
 baseurl: 		"http://eadpucv.github.io/pix"
 exclude:		[bower_components, src]
 name: 			"PiX"
-pixver:			"0.9.1"
+pixver:			"0.9.2"

_includes/donate-button.html

@@ -0,0 +1,7 @@
+<form action="https://www.paypal.com/cgi-bin/webscr" method="post" target="_top">
+	<input type="hidden" name="cmd" value="_s-xclick">
+	<input type="hidden" name="encrypted" value="-----BEGIN PKCS7-----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-----END PKCS7-----
+	">
+	<input type="image" src="https://www.paypalobjects.com/en_US/i/btn/btn_donate_SM.gif" border="0" name="submit" alt="PayPal - The safer, easier way to pay online!">
+	<img alt="" border="0" src="https://www.paypalobjects.com/es_XC/i/scr/pixel.gif" width="1" height="1">
+</form>

_includes/footer.html

@@ -14,6 +14,5 @@
 				</ul>
 			</div>
 		</div>
-
 	</div>
 </footer>

_includes/navbar.html

@@ -5,9 +5,10 @@
     </div>
     <ul class='nav navbar-nav pull-right'>
 
-    	<li class='hidden-xs'><a href='#' class='import' title='import JSON'><i class='pix pix-2x'>import</i></a></li>
+    	<li class='hidden-xs'><a href='#' class='import' title='import JSON'><i class='pix pix-2x'>up</i></a></li>
       <input type='file' id='input' class='upload-json' >
-      <li class='hidden-xs'><a href='#' class='export' title='export JSON'><i class='pix pix-2x'>export</i></a></li>
+      <li class='hidden-xs'><a href='#' class='export' title='export JSON'><i class='pix pix-2x'>down</i></a></li>
+      <li class='hidden-xs'><a href='#' class='embed' title='Embed'><i class='pix pix-2x'>share</i></a></li>
     	<li class='hidden-xs'><a href='javascript:window.print()' title='print or create PDF'><i class='pix pix-2x'>print</i></a></li>
     </ul>
   </div>

_includes/pix-example.html

@@ -210,7 +210,7 @@ <h1 class="score-header">PiX creation Tutorial</h1>
                 </li>
                 <li class="block block-dialogue">
                     <textarea rows="10" placeholder="type here..."></textarea>
-                    <div class="pix-div-input" contenteditable="true"><i class="pix pix-message"></i>     prompt waht to do with the file</div>
+                    <div class="pix-div-input" contenteditable="true"><i class="pix pix-message"></i>     prompt what to do with the file</div>
                 </li>
                 <li class="block block-system">
                     <textarea rows="10" placeholder="type here..."></textarea>

_includes/pix-score-01.html

@@ -42,6 +42,6 @@
                 <a href="#add-note" class="btn btn-xs btn-tools tool-note" title="add note"><img src="http://eadpucv.github.io/pix/img/tool_nota.svg"></a>
             </div>
         </li>
-                </ul>
-            </div>
+    </ul>
+</div>
 

_layouts/app-embed.html

@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<html>
+	{% include app-head.html %}
+	<body lang='ES_es'>
+		<div class='container'>
+			{{ content }}
+		</div>
+	    <script type="text/javascript" src="{{ site.baseurl }}/js/jquery.min.js"></script>
+	    <script type="text/javascript" src="{{ site.baseurl }}/js/handlebars.min.js"></script>
+		<script type="text/javascript" src="{{ site.baseurl }}/js/app.js"></script>
+	</body>
+</html>

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "PiX",
-  "version": "0.9.1",
+  "version": "0.9.2",
   "homepage": "http://www.ead.pucv.cl",
   "authors": [
     "hspencer@ead.cl",