minor fixes

iliakan · iliakan · commit d5f9179a58bd · 2015-01-12T23:01:32.000+03:00
diff --git a/ebook b/ebook
@@ -1,9 +1,5 @@
 #!/bin/bash
 
-# need /h: prefix for //h2 //h3 toc
-#/Applications/calibre.app/Contents/MacOS/ebook-convert ~/Downloads/2.html 2.pdf --authors "Ilya Kantor" --language ru --extra-css=/js/javascript-nodejs/public/styles/base.css --chapter "//*[((name()='h2' or name()='h3') and re:test(., '.*', 'i'))]" --level1-toc '//h2' --level2-toc '//h3' -vv
-#/Applications/calibre.app/Contents/MacOS/ebook-convert ~/Downloads/2.html 2.pdf --level1-toc '//h2' --level2-toc '//h3' -vv
+# CSS_NO_HASH disables hash in CSS, need for ebook
+CSS_NO_HASH=1 NODE_ENV=production gulp edit --harmony
 
-#/Applications/calibre.app/Contents/MacOS/ebook-convert ~/Downloads/2.html 2.epub --embed-all-fonts --epub-inline-toc --level1-toc '//h2' --level2-toc '//h3' -vv
-#/Applications/calibre.app/Contents/MacOS/ebook-convert ~/Downloads/3.html 3.pdf --embed-all-fonts --max-toc-links 0 --level1-toc '//h:h2' --level2-toc '//h:h3' --level3-toc '//h:h4' -vv
-/Applications/calibre.app/Contents/MacOS/ebook-convert ~/Downloads/3.html 3.epub --extra-css=/js/javascript-nodejs/public/styles/base.css --embed-all-fonts --max-toc-links 0 --level1-toc '//h:h2' --level2-toc '//h:h3' --level3-toc '//h:h4' -vv
diff --git a/edit b/edit
@@ -1,3 +1,4 @@
 #!/bin/bash
+
 NODE_ENV=production gulp edit --harmony
 
diff --git a/modules/lib/stylusAsset.js b/modules/lib/stylusAsset.js
@@ -30,7 +30,8 @@ module.exports = function(options) {
       var ext = path.extname(url.val);
       var filepath = url.val.slice(0, url.val.length - ext.length);
 
-      var newUrl = (process.env.NODE_ENV == 'development') ? (url.val + '?' + version) :
+      var newUrl = process.env.CSS_NO_HASH ? url.val :
+        (process.env.NODE_ENV == 'development') ? (url.val + '?' + version) :
         filepath + '.v' + version + ext;
 
       literal = new nodes.Literal('url("../i/' + newUrl + '")');
diff --git a/nginx/mime.types b/nginx/mime.types
@@ -1,5 +1,6 @@
 types {
     application/font-woff		  woff;
+    application/font-sfnt          otf;
     text/html                             html htm shtml;
     text/css                              css;
     text/xml                              xml rss;
diff --git a/styles/blocks/font/font-icons.styl b/styles/blocks/font/font-icons.styl
@@ -1,7 +1,6 @@
 @font-face
 	font-family 'FontIcons'
-	src asset('icons.woff') format('woff'),
-	    asset('icons.otf') format("opentype");
+	src asset('icons.woff') format('woff'), asset('icons.otf') format("opentype");
 	font-weight normal
 	font-style normal
 

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
`1`	`1`	`#!/bin/bash`
	`2`	`+`
`2`	`3`	`NODE_ENV=production gulp edit --harmony`
`3`	`4`