From 14898d3de02521840ebf98d3abfef3b54f11f43c Mon Sep 17 00:00:00 2001 From: "Yann Esposito (Yogsototh)" Date: Wed, 20 Jan 2010 16:20:44 +0100 Subject: [PATCH] version fonctionnelle enfin\! --- .gitignore | 5 +- Rules | 16 +- config.yaml | 15 + content/css/gen.css | 92 +- content/css/layout.css | 7 - content/html/en/index.html | 5 +- layouts/default.html | 75 +- lib/multi.rb | 2 +- output/Scratch/blank.html | 0 output/Scratch/css/blue.css | 216 +++ output/Scratch/css/default.css | 229 +++ output/Scratch/css/disqus.css | 48 + output/Scratch/css/iPhone.css | 72 + output/Scratch/css/idc.css | 8 + output/Scratch/css/ie.css | 216 +++ output/Scratch/css/img/background.jpg | Bin 0 -> 13665 bytes output/Scratch/css/img/black.jpg | Bin 0 -> 13682 bytes output/Scratch/css/img/black600.jpg | Bin 0 -> 8759 bytes output/Scratch/css/img/ombre.jpg | Bin 0 -> 304 bytes output/Scratch/css/img/ombre.png | Bin 0 -> 166 bytes output/Scratch/css/img/red.jpg | Bin 0 -> 13382 bytes output/Scratch/css/img/reflet.png | Bin 0 -> 151 bytes output/Scratch/css/img/reflet10.png | Bin 0 -> 157 bytes output/Scratch/css/img/reflet20.png | Bin 0 -> 151 bytes output/Scratch/css/img/sombre10percent.png | Bin 0 -> 144 bytes output/Scratch/css/img/sombre20percent.png | Bin 0 -> 144 bytes output/Scratch/css/img/white.jpg | Bin 0 -> 13665 bytes output/Scratch/css/js.css | 4 + output/Scratch/css/nojs.css | 21 + output/Scratch/css/originaldisqus.css | 1446 +++++++++++++++ output/Scratch/css/shadows.css | 14 + output/Scratch/css/twilight.css | 147 ++ output/Scratch/css/y.css | 267 +++ output/Scratch/files/cv.pdf | Bin 0 -> 122157 bytes output/Scratch/files/cv_en.pdf | Bin 0 -> 116582 bytes output/Scratch/img/about/avatar.png | Bin 0 -> 18099 bytes output/Scratch/img/about/cv/cv.png | Bin 0 -> 18562 bytes output/Scratch/img/about/yann1.jpg | Bin 0 -> 58314 bytes .../Scratch/img/blog/03_losthighway/intro.jpg | Bin 0 -> 90142 bytes .../img/blog/03_losthighway/mysteryman.jpg | Bin 0 -> 22093 bytes .../img/blog/03_losthighway/rorschach.gif | Bin 0 -> 2755 bytes .../06_How_I_use_git/central_architecture.png | Bin 0 -> 18941 bytes .../xcodeConfig.png | Bin 0 -> 154949 bytes output/Scratch/img/blog/mvc/Screenshot_v0.png | Bin 0 -> 5476 bytes output/Scratch/img/bullet-feed.png | Bin 0 -> 3167 bytes output/Scratch/img/favicon.ico | Bin 0 -> 1406 bytes output/Scratch/img/loading.gif | Bin 0 -> 3244 bytes output/Scratch/img/menu/rss-128.png | Bin 0 -> 13517 bytes output/Scratch/img/menu/rss-32.png | Bin 0 -> 4573 bytes output/Scratch/img/menu/rss-48.png | Bin 0 -> 5656 bytes output/Scratch/img/menu/rss-64.png | Bin 0 -> 6830 bytes output/Scratch/js/disqus.js | 1575 +++++++++++++++++ output/Scratch/js/genericCommentWrapperV2.js | 23 + output/Scratch/js/ie.js | 8 + output/Scratch/js/index.js | 108 ++ output/Scratch/js/jquery-1.3.1.min.js | 19 + output/Scratch/js/jquery.color.js | 123 ++ output/Scratch/js/jquery.cookie.js | 97 + output/Scratch/js/jquery.urlrewrite.js | 1279 +++++++++++++ tasks/resetWebSite.sh | 7 + 60 files changed, 6040 insertions(+), 104 deletions(-) create mode 100644 output/Scratch/blank.html create mode 100644 output/Scratch/css/blue.css create mode 100644 output/Scratch/css/default.css create mode 100644 output/Scratch/css/disqus.css create mode 100644 output/Scratch/css/iPhone.css create mode 100644 output/Scratch/css/idc.css create mode 100644 output/Scratch/css/ie.css create mode 100644 output/Scratch/css/img/background.jpg create mode 100644 output/Scratch/css/img/black.jpg create mode 100644 output/Scratch/css/img/black600.jpg create mode 100644 output/Scratch/css/img/ombre.jpg create mode 100644 output/Scratch/css/img/ombre.png create mode 100644 output/Scratch/css/img/red.jpg create mode 100644 output/Scratch/css/img/reflet.png create mode 100644 output/Scratch/css/img/reflet10.png create mode 100644 output/Scratch/css/img/reflet20.png create mode 100644 output/Scratch/css/img/sombre10percent.png create mode 100644 output/Scratch/css/img/sombre20percent.png create mode 100644 output/Scratch/css/img/white.jpg create mode 100644 output/Scratch/css/js.css create mode 100644 output/Scratch/css/nojs.css create mode 100644 output/Scratch/css/originaldisqus.css create mode 100644 output/Scratch/css/shadows.css create mode 100644 output/Scratch/css/twilight.css create mode 100644 output/Scratch/css/y.css create mode 100644 output/Scratch/files/cv.pdf create mode 100644 output/Scratch/files/cv_en.pdf create mode 100644 output/Scratch/img/about/avatar.png create mode 100644 output/Scratch/img/about/cv/cv.png create mode 100644 output/Scratch/img/about/yann1.jpg create mode 100644 output/Scratch/img/blog/03_losthighway/intro.jpg create mode 100644 output/Scratch/img/blog/03_losthighway/mysteryman.jpg create mode 100644 output/Scratch/img/blog/03_losthighway/rorschach.gif create mode 100644 output/Scratch/img/blog/06_How_I_use_git/central_architecture.png create mode 100644 output/Scratch/img/blog/07_Screensaver_compilation_option_for_Snow_Leopard/xcodeConfig.png create mode 100644 output/Scratch/img/blog/mvc/Screenshot_v0.png create mode 100644 output/Scratch/img/bullet-feed.png create mode 100644 output/Scratch/img/favicon.ico create mode 100644 output/Scratch/img/loading.gif create mode 100644 output/Scratch/img/menu/rss-128.png create mode 100644 output/Scratch/img/menu/rss-32.png create mode 100644 output/Scratch/img/menu/rss-48.png create mode 100644 output/Scratch/img/menu/rss-64.png create mode 100644 output/Scratch/js/disqus.js create mode 100644 output/Scratch/js/genericCommentWrapperV2.js create mode 100644 output/Scratch/js/ie.js create mode 100644 output/Scratch/js/index.js create mode 100644 output/Scratch/js/jquery-1.3.1.min.js create mode 100644 output/Scratch/js/jquery.color.js create mode 100644 output/Scratch/js/jquery.cookie.js create mode 100644 output/Scratch/js/jquery.urlrewrite.js create mode 100755 tasks/resetWebSite.sh diff --git a/.gitignore b/.gitignore index a14cdecbe..7e56d6e64 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,7 @@ *.swp .DS_Store -output/ +output/Scratch/assets +output/Scratch/en +output/Scratch/fr +output/Scratch/map.yrf tmp/ diff --git a/Rules b/Rules index ebfc37203..68370fd07 100644 --- a/Rules +++ b/Rules @@ -12,9 +12,23 @@ compile '/css/*' do filter :sass end route '/css/*' do - '/Scratch' + item.identifier.chop + '.css' + '/Scratch/assets' + item.identifier.chop + '.css' end +compile '/css/raw/*' do +end +route '/css/raw/*' do + '/Scratch' + item.identifier.sub(/raw\//,'').chop + '.css' +end + +# JS +compile '/js/*' do +end +route '/js/*' do + '/Scratch/assets' + item.identifier.chop + '.js' +end + + # HTML compile '/html/*' do filter :erb diff --git a/config.yaml b/config.yaml index 9090ad1d0..e475cc1e5 100644 --- a/config.yaml +++ b/config.yaml @@ -47,3 +47,18 @@ translations: loading: fr: "Chargement en cours..." en: "loading..." + entirely_done_with: + en: "Entirely done with" + fr: "Site entièrement réalisé avec" + and: + en: "and" + fr: "et" + last_modified: + en: "Last modified" + fr: "dernière modification " + copyright: + en: "Copyright©" + fr: "Droits de reproduction ©" + subscribe: + en: "Subscribe" + fr: "s'abonner" diff --git a/content/css/gen.css b/content/css/gen.css index 9173a50ca..be54cbf57 100644 --- a/content/css/gen.css +++ b/content/css/gen.css @@ -1,11 +1,4 @@ ----- -# Built-in -filters: - - sass -binary: false - -# Custom - ----- !rouge_clair = #cc0000 !rouge_fonce = #6c0000 @@ -29,13 +22,12 @@ binary: false :style solid :width 1px :color = !texte_normal - a, - a:link + a, a:link color: #a00 - &:visited - color: #a00 - &:active, &:hover - color: #f00 + a:visited + color: #a00 + a:active, a:hover + color: #f00 =black :text-shadow 0 1px #000 @@ -48,13 +40,12 @@ binary: false :style solid :width 1px color: #eee - a, - a:link + a, a:link :color #ddd - &:visited - :color = !blanc_fonce - &:active, &:hover - :color #cc0000 + a:visited + :color = !blanc_fonce + a:active, a:hover + :color #cc0000 =red :background @@ -63,15 +54,14 @@ binary: false :color = !rouge_fonce :border-color = !rouge_fonce color: #fff - a, - a:link + a, a:link :font-weight bold :text-decoration none :color #eee - &:visited - :color = !blanc_fonce - &:active, &:hover - :color #fff + a:visited + :color = !blanc_fonce + a:active, a:hover + :color #fff =smallblock background-position: 50% 50% @@ -181,23 +171,20 @@ binary: false +white :text-weight bold :font-size 1.3em - a, - a:link, + a, a:link + :color = !texte_attenue a:visited :color = !texte_attenue - &:active, &:hover - color = !rouge_clair + a:active, a:hover + color = !rouge_clair .corps +white - a, - a:link, - a:visited + a, a:link, a:visited color = !rouge_fonce font-weight: normal - &:active, - &:hover - color: #f00 + a:active, a:hover + color: #f00 a.navigationprev, a.navigationnext @@ -353,8 +340,8 @@ table.description tr td, text-shadow: 0px -1px 1px #333 .corps h2 - color: #999 - text-shadow: 0 1px #ccc + color: #ddd + text-shadow: 0 -1px #999 .corps h2 a, .corps h3 a, @@ -381,19 +368,18 @@ body // :image url('../../css/img/background.jpg') // :attachment fixed -a, -a:link +a :font-weight bold :text-decoration none +a, a:link color: #a00 outline: none - &:visited - color: #a00 - outline: none - &:active, - &:hover - color: #f00 - outline: none +a:visited + color: #a00 + outline: none +a:active, a:hover + color: #f00 + outline: none ul :list-style square @@ -423,11 +409,11 @@ ul a, a:link :color #ddd - &:visited - :color = !blanc_fonce - &:active, - &:hover - color: #cc0000 + a:visited + :color = !blanc_fonce + a:active, + a:hover + color: #cc0000 // --- les fontes #boutonMessage @@ -444,6 +430,10 @@ body, h1, h2, h3, h4, #entete font-family: Georgia, "Times New Roman", Times, serif line-height: 1.6em +pre, code + :font + :family monaco, monospace + p margin-bottom: 1.2em diff --git a/content/css/layout.css b/content/css/layout.css index 46f5babc0..82b75ced8 100644 --- a/content/css/layout.css +++ b/content/css/layout.css @@ -1,11 +1,4 @@ ----- -# Built-in -filters: - - sass -binary: false - -# Custom - ----- // /* // La dedans, seulement ce qui concerne le layout diff --git a/content/html/en/index.html b/content/html/en/index.html index 8baeebdaf..b8cca233b 100644 --- a/content/html/en/index.html +++ b/content/html/en/index.html @@ -1,8 +1,5 @@ --- -title: Titre principal -multiTitle: - fr: Titre en français - en: English Title +title: English title ---

A Brand New nanoc Site

diff --git a/layouts/default.html b/layouts/default.html index 9f61d626f..ae232b57f 100644 --- a/layouts/default.html +++ b/layouts/default.html @@ -45,17 +45,16 @@ puts conf.to_s - + - + <% @conf.languages.collect do |lang| %> - + <% end %> -