diff --git a/sitegin/transformer-images.js b/sitegin/transformer-images.js index 9a16047ca9fa61521fd1f7eb6a80915f6f52597c..b764a473d2d6fef737b6e6cd2676a0cf8ca35925 100644 --- a/sitegin/transformer-images.js +++ b/sitegin/transformer-images.js @@ -82,11 +82,16 @@ module.exports = function() { var tr = this; tr.fancyname = "transformer images"; tr.pre = function(cb, list) { - minify() - .then(function(imageList) { - list.images = imageList; + if(process.argv[2] == "compileonly") { + minify() + .then(function(imageList) { + list.images = imageList; + cb(); + }) + .catch(function(err) {console.log(err.stack); cb();}); + } else { + console.log("Skipping image minification"); cb(); - }) - .catch(function(err) {console.log(err.stack); cb();}); + } } } diff --git a/sitegin/transformer-markdown.js b/sitegin/transformer-markdown.js index abaf3e563ef5f21c907d1f07b11a4ab5259e04ce..e6bb54040ec45cb1ab64170433f9751cd8354ecc 100644 --- a/sitegin/transformer-markdown.js +++ b/sitegin/transformer-markdown.js @@ -8,6 +8,7 @@ try {require('lwip');} catch(e) { minificationOK = false; } +if(process.argv[2] !== "compileonly") minificationOK = false; var images = {}; @@ -44,10 +45,11 @@ module.exports = function() { var tr = this; tr.fancyname = "transformer markdown"; tr.pre = function(cb, list) { - list.images.forEach((img) => { - images[img.file] = img; - }); - console.log(images); + if(minificationOK) { + list.images.forEach((img) => { + images[img.file] = img; + }); + } cb(); }; tr.forEachPage = function(article, cb) { @@ -84,13 +86,13 @@ module.exports = function() { if(size.length > 1 && size[1].length > 0) { out += ' height="' + size[1] + '"'; } + } else if(!minificationOK) { + out += ' style="max-width:512px"'; } if (title) { out += ' title="' + title + '"'; } - if(!minificationOK) { - out += ' style="max-width:512px"'; - } + out += '>'; if(full) { var a = '<a href="'+full+'"'; diff --git a/theme/sass/style.scss b/theme/sass/style.scss index 43febc9e8c69105796e3019e1ad74b5212b58346..2c8426813b5566c4e8f862d09b72cde1c9e0048a 100644 --- a/theme/sass/style.scss +++ b/theme/sass/style.scss @@ -258,7 +258,7 @@ nav.subnav li { text-align: left; padding: 0 .5rem; max-width: $p-max-width; - margin: 10px auto; + margin: 0px auto; } h3, h4, h5, h6 { max-width: $p-max-width;