From 36f48eb407b5ef02c768f9afca541fdd7a32ee39 Mon Sep 17 00:00:00 2001 From: coderaiser Date: Fri, 15 Jun 2012 13:06:32 +0000 Subject: [PATCH] convert images to base64 option added --- images/console_clear.png | Bin 1344 -> 0 bytes images/dir.png | Bin 537 -> 0 bytes images/panel_refresh.png | Bin 872 -> 0 bytes images/spinner.gif | Bin 1569 -> 0 bytes images/txt.png | Bin 294 -> 0 bytes lib/server/minify.js | 29 +++++++++++++++++++++++++---- style.css | 12 ++++++------ 7 files changed, 31 insertions(+), 10 deletions(-) delete mode 100644 images/console_clear.png delete mode 100644 images/dir.png delete mode 100644 images/panel_refresh.png delete mode 100644 images/spinner.gif delete mode 100644 images/txt.png diff --git a/images/console_clear.png b/images/console_clear.png deleted file mode 100644 index f5739eb13b9c313415b984ea96ad47505c9dd7e7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1344 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 diff --git a/lib/server/minify.js b/lib/server/minify.js index 7680747b..4e87e163 100644 --- a/lib/server/minify.js +++ b/lib/server/minify.js @@ -81,9 +81,12 @@ exports.jsScripts=function jsScripts(){ /* функция сжимает css-стили * и сохраняет их с именем .min.css + * @pImgConvertToBase64_b - булевый признак, + * который отвечает за то, что быконвертировать + * картинки в base64 и поместить в выходной css файл */ -exports.cssStyles=function cssStyles(){ - 'use strict'; +exports.cssStyles=function cssStyles(pImgConvertToBase64_b){ + 'use strict'; /* connecting cleanCSS, * if we can't find it - @@ -213,7 +216,25 @@ exports.html=function(){ return true; }; - +/* функция переводит картинки в base64 и записывает в css-файл*/ +function base64_images(){ + 'use strict'; + var b64img; + try{ + b64img = require('css-b64-images'); + }catch(error){ + console.log('can\'n load clean-css \n' + + 'to use images to base64 convertation you need to install css-base64-images \n' + + 'npm install -g css-b64-images\n' + + 'https://github.com/GoalSmashers/clean-css'); + return false; + } + + b64img('style.min.css', '.', function(err, css){ + if(err) console.error('Error:', err); + console.log('**'+css); + }); +} /* Функция создаёт асинхроную версию * для чтения файла @@ -246,4 +267,4 @@ function fileWrited(pFileName){ return function(error){ console.log(error?error:('file '+pFileName+' writed...')); }; -} +} \ No newline at end of file diff --git a/style.css b/style.css index 0b6f9229..57136168 100644 --- a/style.css +++ b/style.css @@ -74,7 +74,7 @@ body{ top: -3px; } .loading{ - background:url(/images/spinner.gif); + background:url(/img/spinner.gif); position:relative; top:1px; } @@ -82,14 +82,14 @@ body{ color:rgba(222, 41, 41, 0.81); } .refresh-icon{ - background:url(/images/panel_refresh.png) no-repeat; + background:url(/img/panel_refresh.png) no-repeat; } .refresh-icon:active{ /*background-position-y: -15px;*/ -background:url(/images/panel_refresh.png) 0 -15px no-repeat; +background:url(/img/panel_refresh.png) 0 -15px no-repeat; } .clear-cache{ - background:url(/images/console_clear.png) -4px -4px no-repeat; + background:url(/img/console_clear.png) -4px -4px no-repeat; margin-right: 6px; margin-left: 7px; } @@ -123,13 +123,13 @@ background:url(/images/panel_refresh.png) 0 -15px no-repeat; /* freeupex */ .directory{ /*list-style-image*/ - background-image:url('/images/dir.png'); + background-image:url('/img/dir.png'); background-repeat: no-repeat; background-position: 0 0; } .text-file{ /*list-style-image*/ - background-image:url('/images/txt.png'); + background-image:url('/img/txt.png'); background-repeat: no-repeat; background-position: 0 0; }