diff --git a/Makefile b/Makefile
index 436c201..b1fbfb9 100644
--- a/Makefile
+++ b/Makefile
@@ -1,13 +1,6 @@
SHELL:=/bin/bash
-less-compilation: less-checking ./less/main.less
- @ ./node_modules/.bin/lessc ./less/main.less ./public/css/main.min.css --clean-css="-s0"
- @ echo "Fichier less/main.less compilé et minifié dans public/css/main.min.css"
-
-less-checking: ./node_modules/.bin/lessc ./node_modules/less-plugin-clean-css
- @ echo "Verification des modules nodes lessc et less-plugin-clean-css"
-
npm-install:
@ npm install
-install: ./package.json npm-install less-compilation
\ No newline at end of file
+install: ./package.json npm-install
\ No newline at end of file
diff --git a/include/surenteteistex.html b/include/surenteteistex.html
index 055eefa..091f844 100644
--- a/include/surenteteistex.html
+++ b/include/surenteteistex.html
@@ -17,16 +17,16 @@
API
- demo
+ demo
- widget
+ widget
blog
-
+
- wiki
diff --git a/lib/npm/postInstall.js b/lib/npm/postInstall.js
new file mode 100644
index 0000000..1ec2c5e
--- /dev/null
+++ b/lib/npm/postInstall.js
@@ -0,0 +1,23 @@
+(function() {
+ 'use strict';
+
+ var
+ fs = require('fs')
+ , less = require('less')
+ , LessPluginCleanCSS = require('less-plugin-clean-css')
+ , cleanCSSPlugin = new LessPluginCleanCSS({advanced: true, 'clean-css': '-s0'})
+ , source = '@import "./less/main.less";'
+ ;
+
+ less.render(source, {plugins: [cleanCSSPlugin]}, function(err, output) {
+ if (err) throw err;
+ fs.writeFile(
+ './public/css/main.min.css',
+ output.css,
+ function(err) {
+ if (err) throw err;
+ console.info('Fichier less/main.less compilé et minifié dans public/css/main.min.css');
+ });
+ });
+}());
+
diff --git a/main.js b/main.js
index fb24d1c..7f0b0e0 100644
--- a/main.js
+++ b/main.js
@@ -35,7 +35,6 @@
;
window.location.hostname === "www.istex.fr" && $webHeader.find('.logoistex').remove();
- window.location.hostname === "wiki.istex.fr" && $webHeader.find(".srent").addClass('border');
}
});
diff --git a/package.json b/package.json
index 3254dcb..87db807 100644
--- a/package.json
+++ b/package.json
@@ -10,6 +10,9 @@
"less": "^2.4.0",
"less-plugin-clean-css": "^1.5.0"
},
+ "scripts": {
+ "postinstall": "node ./lib/npm/postInstall.js"
+ },
"repository": {
"type": "git",
"url": "ssh://istexdepl@vsistex.intra.inist.fr:22222/istex/web-header.git"
diff --git a/public/css/main.min.css b/public/css/main.min.css
index 2c9812a..6f76cf7 100644
--- a/public/css/main.min.css
+++ b/public/css/main.min.css
@@ -1 +1 @@
-.sandbox a,.sandbox abbr,.sandbox acronym,.sandbox address,.sandbox applet,.sandbox article,.sandbox aside,.sandbox audio,.sandbox b,.sandbox big,.sandbox blockquote,.sandbox body,.sandbox canvas,.sandbox caption,.sandbox center,.sandbox cite,.sandbox code,.sandbox dd,.sandbox del,.sandbox details,.sandbox dfn,.sandbox div,.sandbox dl,.sandbox dt,.sandbox em,.sandbox embed,.sandbox fieldset,.sandbox figcaption,.sandbox figure,.sandbox footer,.sandbox form,.sandbox h1,.sandbox h2,.sandbox h3,.sandbox h4,.sandbox h5,.sandbox h6,.sandbox header,.sandbox hgroup,.sandbox html,.sandbox i,.sandbox iframe,.sandbox img,.sandbox ins,.sandbox kbd,.sandbox label,.sandbox legend,.sandbox li,.sandbox mark,.sandbox menu,.sandbox nav,.sandbox object,.sandbox ol,.sandbox output,.sandbox p,.sandbox pre,.sandbox q,.sandbox ruby,.sandbox s,.sandbox samp,.sandbox section,.sandbox small,.sandbox span,.sandbox strike,.sandbox strong,.sandbox sub,.sandbox summary,.sandbox sup,.sandbox table,.sandbox tbody,.sandbox td,.sandbox tfoot,.sandbox th,.sandbox thead,.sandbox time,.sandbox tr,.sandbox tt,.sandbox u,.sandbox ul,.sandbox var,.sandbox video{margin:0;padding:0;border:0;font-size:100%;font:inherit;vertical-align:baseline}.sandbox article,.sandbox aside,.sandbox details,.sandbox figcaption,.sandbox figure,.sandbox footer,.sandbox header,.sandbox hgroup,.sandbox menu,.sandbox nav,.sandbox section{display:block}.sandbox body{line-height:1}.sandbox ol,.sandbox ul{list-style:none}.sandbox blockquote,.sandbox q{quotes:none}.sandbox blockquote:after,.sandbox blockquote:before,.sandbox q:after,.sandbox q:before{content:'';content:none}.sandbox table{border-collapse:collapse;border-spacing:0}#istex-web-header #surentete{margin:0 auto;padding:0;font-family:Arial,Helvetica,sans-serif;color:#333;height:40px;width:990px;position:relative;z-index:1000}#istex-web-header #barresrent{border-bottom:1px solid #eaeade}#istex-web-header .bsbb,#istex-web-header .srent li{box-sizing:border-box}#istex-web-header .clear{clear:both}#istex-web-header .logoistex{position:absolute;margin:3px 0 0 0}#istex-web-header .logoanr img,#istex-web-header .logoistex img{float:left}#istex-web-header .srent{margin:0 50px 0 0;padding:10px 0 0 0;list-style-type:none;position:relative;background:0 0;float:right}#istex-web-header .srent img{padding:0 7px 0 20px}#istex-web-header .srent li{float:left;position:relative;display:block;height:30px;line-height:30px;padding-right:10px}#istex-web-header .srent a:link{text-decoration:none;height:30px}#istex-web-header .srent a:active,#istex-web-header .srent a:hover,#istex-web-header .srent a:visited{text-decoration:underline}#istex-web-header .srent a:active,#istex-web-header .srent a:hover,#istex-web-header .srent a:link,#istex-web-header .srent a:visited{color:#000;display:block;text-align:center;font-size:.8em}#istex-web-header .srent li li{background-color:transparent;border-right:1px solid #eaeade;border-bottom:1px solid #eaeade;border-left:1px solid #eaeade;padding-left:10px;color:#fff}#istex-web-header .srent li li,#istex-web-header .srent li li a,#istex-web-header .srent li li a:focus,#istex-web-header .srent li li a:hover{display:block;width:100px}#istex-web-header .srent li li a:active,#istex-web-header .srent li li a:focus,#istex-web-header .srent li li a:hover,#istex-web-header .srent li li a:link,#istex-web-header .srent li li a:visited{text-align:left}#istex-web-header .srent li li a:focus,#istex-web-header .srent li li a:hover{text-align:left;display:block;width:100px;height:30px}#istex-web-header .srent ul{position:absolute;display:none;padding:0;list-style-type:none}#istex-web-header .srent li ul a{float:left}#istex-web-header .srent li:focus ul,#istex-web-header .srent li:hover ul{display:block}#istex-web-header .srent li li img{padding:0 5px 0 3px}#istex-web-header #surentete{border-bottom:1px solid #eaeade}#istex-web-header #surentete .srent,#istex-web-header #surentete .srentss{background-color:#fff}#istex-web-header #surentete .srentss{border:1px solid #eaeade}#istex-web-header #surentete .srentss>li{border:0}#istex-web-header #surentete .srentss>li+li{border-top:1px solid #eaeade}#istex-web-header #surentete .srent{margin-top:9px;padding:0}#istex-web-header #surentete .srent.border{margin-top:8px;border:1px solid #eaeade;border-bottom:0}#istex-web-header #surentete .srent img{vertical-align:middle}#istex-web-header #surentete a.disabled{color:#777;text-decoration:none;cursor:not-allowed}#dokuwiki__site{position:relative}
\ No newline at end of file
+.sandbox a,.sandbox abbr,.sandbox acronym,.sandbox address,.sandbox applet,.sandbox article,.sandbox aside,.sandbox audio,.sandbox b,.sandbox big,.sandbox blockquote,.sandbox body,.sandbox canvas,.sandbox caption,.sandbox center,.sandbox cite,.sandbox code,.sandbox dd,.sandbox del,.sandbox details,.sandbox dfn,.sandbox div,.sandbox dl,.sandbox dt,.sandbox em,.sandbox embed,.sandbox fieldset,.sandbox figcaption,.sandbox figure,.sandbox footer,.sandbox form,.sandbox h1,.sandbox h2,.sandbox h3,.sandbox h4,.sandbox h5,.sandbox h6,.sandbox header,.sandbox hgroup,.sandbox html,.sandbox i,.sandbox iframe,.sandbox img,.sandbox ins,.sandbox kbd,.sandbox label,.sandbox legend,.sandbox li,.sandbox mark,.sandbox menu,.sandbox nav,.sandbox object,.sandbox ol,.sandbox output,.sandbox p,.sandbox pre,.sandbox q,.sandbox ruby,.sandbox s,.sandbox samp,.sandbox section,.sandbox small,.sandbox span,.sandbox strike,.sandbox strong,.sandbox sub,.sandbox summary,.sandbox sup,.sandbox table,.sandbox tbody,.sandbox td,.sandbox tfoot,.sandbox th,.sandbox thead,.sandbox time,.sandbox tr,.sandbox tt,.sandbox u,.sandbox ul,.sandbox var,.sandbox video{margin:0;padding:0;border:0;font:inherit;vertical-align:baseline}#istex-web-header #barresrent,#istex-web-header #surentete,#istex-web-header .srent li li{border-bottom:1px solid #eaeade}.sandbox article,.sandbox aside,.sandbox details,.sandbox figcaption,.sandbox figure,.sandbox footer,.sandbox header,.sandbox hgroup,.sandbox menu,.sandbox nav,.sandbox section{display:block}.sandbox body{line-height:1}.sandbox ol,.sandbox ul{list-style:none}.sandbox blockquote,.sandbox q{quotes:none}.sandbox blockquote:after,.sandbox blockquote:before,.sandbox q:after,.sandbox q:before{content:'';content:none}.sandbox table{border-collapse:collapse;border-spacing:0}#istex-web-header #surentete{margin:0 auto;padding:0;font-family:Arial,Helvetica,sans-serif;color:#333;height:40px;width:990px;position:relative;z-index:1000}#istex-web-header .bsbb,#istex-web-header .srent li{box-sizing:border-box}#istex-web-header .clear{clear:both}#istex-web-header .logoistex{position:absolute;margin:3px 0 0}#istex-web-header .logoanr img,#istex-web-header .logoistex img{float:left}#istex-web-header .srent{margin:0 50px 0 0;padding:10px 0 0;list-style-type:none;position:relative;background:0 0;float:right}#istex-web-header .srent img{padding:0 7px 0 20px}#istex-web-header .srent li{float:left;position:relative;display:block;height:30px;line-height:30px;padding-right:10px}#istex-web-header .srent a:link{text-decoration:none;height:30px}#istex-web-header .srent a:active,#istex-web-header .srent a:hover,#istex-web-header .srent a:visited{text-decoration:underline}#istex-web-header .srent a:active,#istex-web-header .srent a:hover,#istex-web-header .srent a:link,#istex-web-header .srent a:visited{color:#000;display:block;text-align:center;font-size:.8em}#istex-web-header .srent li li{background-color:transparent;border-right:1px solid #eaeade;border-left:1px solid #eaeade;padding-left:10px;color:#fff}#istex-web-header .srent li li,#istex-web-header .srent li li a,#istex-web-header .srent li li a:focus,#istex-web-header .srent li li a:hover{display:block;width:100px}#istex-web-header .srent li li a:active,#istex-web-header .srent li li a:focus,#istex-web-header .srent li li a:hover,#istex-web-header .srent li li a:link,#istex-web-header .srent li li a:visited{text-align:left}#istex-web-header .srent li li a:focus,#istex-web-header .srent li li a:hover{text-align:left;display:block;width:100px;height:30px}#istex-web-header .srent ul{position:absolute;display:none;padding:0;list-style-type:none}#istex-web-header .srent li ul a{float:left}#istex-web-header .srent li:focus ul,#istex-web-header .srent li:hover ul{display:block}#istex-web-header .srent li li img{padding:0 5px 0 3px}#istex-web-header #surentete .srent,#istex-web-header #surentete .srentss{background-color:#fff}#istex-web-header #surentete .srentss{border:1px solid #eaeade}#istex-web-header #surentete .srentss>li{border:0}#istex-web-header #surentete .srentss>li+li{border-top:1px solid #eaeade}#istex-web-header #surentete .srent{margin-top:9px;padding:0}#istex-web-header #surentete .srent.border{margin-top:8px;border:1px solid #eaeade;border-bottom:0}#istex-web-header #surentete .srent img{vertical-align:middle}#istex-web-header #surentete a.disabled{color:#777;text-decoration:none;cursor:not-allowed}#dokuwiki__site{position:relative}
\ No newline at end of file
diff --git a/public/img/LogoApi.png b/public/img/LogoApi.png
index 8547483..bfcd79f 100644
--- a/public/img/LogoApi.png
+++ b/public/img/LogoApi.png
Binary files differ
diff --git a/public/img/LogoBlog.png b/public/img/LogoBlog.png
index d0cb5f9..53b0e77 100644
--- a/public/img/LogoBlog.png
+++ b/public/img/LogoBlog.png
Binary files differ
diff --git a/public/img/LogoDemo.jpg b/public/img/LogoDemo.jpg
deleted file mode 100644
index a37500c..0000000
--- a/public/img/LogoDemo.jpg
+++ /dev/null
Binary files differ
diff --git a/public/img/LogoDemo.png b/public/img/LogoDemo.png
new file mode 100644
index 0000000..98a9665
--- /dev/null
+++ b/public/img/LogoDemo.png
Binary files differ
diff --git a/public/img/LogoIstexANR.png b/public/img/LogoIstexANR.png
index ed418a1..00b2c90 100644
--- a/public/img/LogoIstexANR.png
+++ b/public/img/LogoIstexANR.png
Binary files differ
diff --git a/public/img/LogoTwitter.png b/public/img/LogoTwitter.png
index 9292815..631290c 100644
--- a/public/img/LogoTwitter.png
+++ b/public/img/LogoTwitter.png
Binary files differ
diff --git a/public/img/LogoVerrou.jpg b/public/img/LogoVerrou.jpg
deleted file mode 100644
index 661f62a..0000000
--- a/public/img/LogoVerrou.jpg
+++ /dev/null
Binary files differ
diff --git a/public/img/LogoVerrou.png b/public/img/LogoVerrou.png
new file mode 100644
index 0000000..dd4b664
--- /dev/null
+++ b/public/img/LogoVerrou.png
Binary files differ
diff --git a/public/img/LogoWidget.jpg b/public/img/LogoWidget.jpg
deleted file mode 100644
index ad7d8bb..0000000
--- a/public/img/LogoWidget.jpg
+++ /dev/null
Binary files differ
diff --git a/public/img/LogoWidget.png b/public/img/LogoWidget.png
new file mode 100644
index 0000000..2ba76fd
--- /dev/null
+++ b/public/img/LogoWidget.png
Binary files differ
diff --git a/public/img/LogoWiki.png b/public/img/LogoWiki.png
index 1bab839..f25d056 100644
--- a/public/img/LogoWiki.png
+++ b/public/img/LogoWiki.png
Binary files differ
diff --git a/public/img/Logokanban.png b/public/img/Logokanban.png
index 401ec90..6ac2070 100644
--- a/public/img/Logokanban.png
+++ b/public/img/Logokanban.png
Binary files differ