diff --git a/content/css/main.css b/content/css/main.css
index 10b1ff720..c24b3f554 100644
--- a/content/css/main.css
+++ b/content/css/main.css
@@ -6,11 +6,34 @@ $behindColor: #1a0000
$mainBackgroundColor: #fffae3
$mainColor: #551100
$revealColor: #faeac3
-$mainLinkColor: #aa5522
+$mainLinkColor: #663300
$lighterColor: #eee0c2
$codeBlockColor: $mainBackgroundColor
$codeBlockBackgroundColor: $behindColor
+@mixin mainColor
+ color: $behindColor
+ background:
+ color: $mainBackgroundColor
+ image: url('/Scratch/css/img/mainColor.png')
+
+@mixin secondColor
+ color: $behindColor
+ background:
+ color: $lighterColor
+ image: url('/Scratch/css/img/secondColor.png')
+
+@mixin revealColor
+ background:
+ color: $revealColor
+ image: url('/Scratch/css/img/revealColor.png')
+
+@mixin codeColor
+ background:
+ color: $codeBlockBackgroundColor
+ image: url('/Scratch/css/img/codeColor.png')
+ color: $codeBlockColor
+
table.description tr td
border: 1px solid $lighterColor
@@ -19,14 +42,11 @@ table.description tr td
body
background:
- color: $behindColor
image: url('/Scratch/css/img/background.png')
color: $mainBackgroundColor
#content
- background:
- color: $mainBackgroundColor
- color: $mainColor
+ @include mainColor
a, a:link, a:visited, a:active, a:hover, #clickcomment
text-decoration: none
@@ -34,7 +54,7 @@ a, a:link, a:visited, a:active, a:hover, #clickcomment
color: $mainLinkColor
a:hover, #clickcomment:hover
- background-color: $revealColor
+ @include revealColor
hr
color: $mainColor
@@ -59,8 +79,7 @@ body, h1, h2, h3, h4, #entete, .tag
background-repeat: no-repeat
pre
- background-color: $codeBlockBackgroundColor
- color: $codeBlockColor
+ @include codeColor
padding: 1em
line-height: 1.2em
@@ -89,12 +108,12 @@ acronym
// -- STYLE --
#titre
- background: $lighterColor
+ @include secondColor
border-top: 1px solid $mainColor
border-bottom: 1px solid $mainColor
#liens .active, #bottom, #sousliens
- background-color: $lighterColor
+ @include secondColor
// -- FOOTER --
#lastmod
@@ -151,7 +170,7 @@ h1 > .date
.date .month
border-left: solid $mainColor 0.1em
- background-color: $lighterColor
+ @include secondColor
color: $mainColor
float: right
width: 2.3em
@@ -291,14 +310,14 @@ $contentMargin: 0em
bottom: 2em
.encadre, .black, .red, .shadow
- background-color: $lighterColor
+ @include secondColor
.intro, .resume
font-size: .9em
font-style: italic
#afterheader > h1
- background-color: $lighterColor
+ @include secondColor
width: 100%
padding-bottom: 1.5em
diff --git a/output/Scratch/assets/css/main.css b/output/Scratch/assets/css/main.css
index e2b882c1e..b79a4486a 100644
--- a/output/Scratch/assets/css/main.css
+++ b/output/Scratch/assets/css/main.css
@@ -1 +1 @@
-table.description tr td{border:1px solid #eee0c2}.assombris20{background-color:#eee0c2}body{background-color:#1a0000;background-image:url("/Scratch/css/img/background.png");color:#fffae3}#content{background-color:#fffae3;color:#510}a,a:link,a:visited,a:active,a:hover,#clickcomment{text-decoration:none;outline:none;color:#a52}a:hover,#clickcomment:hover{background-color:#faeac3}hr{color:#510;border-bottom:1px solid #faeac3}ul{list-style:square}h1,h2,h3,h4,h5,h6{font-variant:small-caps}body,h1,h2,h3,h4,#entete,.tag{font-family:Optima,"Century Gothic",Helvetica,Arial,sans-serif;line-height:1.4em}.corps{font-family:Palatino,"Century Schoolbook L","Times New Roman",Times,serif;line-height:1.6em;text-align:justify;background-image:url("/Scratch/css/img/separator.png");background-position:center bottom;background-repeat:no-repeat}pre{background-color:#1a0000;color:#fffae3;padding:1em;line-height:1.2em}pre,code{font-family:monaco,monospace;font-size:.7em}p{margin-bottom:1.2em}blockquote{font-style:italic;padding:.5em 1em}abbr,acronym{font-variant:small-caps;text-decoration:none;border-bottom-width:0}#titre{background:#eee0c2;border-top:1px solid#510;border-bottom:1px solid#510}#liens .active,#bottom,#sousliens{background-color:#eee0c2}#lastmod{font-size:.8em}.nojsbutton{font-size:2.5em}#clickcomment{cursor:pointer;font-size:1.2em}.small{font-size:.8em}.strong{font-weight:700}.sc{font-variant:small-caps}.impact,.darkimpact{font-size:2em;margin:0 auto 1em auto;line-height:1.3em}h1 > .date{font-size:.6em;color:#510}.date{text-align:center;font-size:.7em;color:#fffae3;width:4.1em;border:1px solid #eee0c2;line-height:1.5em;display:inline-block;border:solid black 1px;position:relative;top:2.75em;left:-5em}.date .day{color:#510;background-color:#fffae3;float:left;width:1.7em}.date .month{border-left:solid#510 .1em;background-color:#eee0c2;color:#510;float:right;width:2.3em}.date .year{border-top:solid#510 1px;border-bottom:solid#510 1px;line-height:3ex;clear:both;background-color:#510;color:#fffae3}body{text-align:center;font-size:1em}body > #entete{position:relative;left:0;top:.5em;width:100%;min-width:50em;z-index:1800;padding-bottom:1em;margin-bottom:3em}#titre h2{width:80%;margin-left:auto;margin-right:auto;text-align:center}#titre{text-align:center;width:100%;padding-top:1em;padding-bottom:1em}#titre h1,#titre h2{padding-left:1em;padding-right:1em}#bottom{clear:right;margin-right:0;text-align:right;padding:1.5em;line-height:1.5em}#sousliens{padding:1em 0;line-height:2em}#sousliens ul{list-style:none;margin-left:4em}ul.horizontal li{display:inline;font-size:.9em}ul.horizontal{margin-top:0;margin-bottom:0}#entete{padding-top:.1em;border-top:1px solid#510;margin-bottom:2em}#liens{width:100%;padding:0;clear:both;margin-top:.5em}#liens ul{width:100%;clear:both;padding:0;margin:0}#liens ul li{display:inline-block;height:4em;margin-left:.2em;margin-right:.2em;width:23%}#liens ul li a,#liens ul li span{width:100%;display:block;line-height:4em}.clear{clear:both}#content{line-height:4em;margin-left:auto;margin-right:auto;margin-top:0;position:relative;top:-1em;clear:both;width:52em}#content > #choix{margin-top:1em}.encadre,.black,.red,.intro,.resume,.shadow{padding-left:2em;padding-right:2em;margin-top:2em;margin-bottom:2em}.encadre,.black,.red,.shadow{background-color:#eee0c2}.intro,.resume{font-size:.9em;font-style:italic}#afterheader > h1{background-color:#eee0c2;width:100%;padding-bottom:1.5em}#afterheader{padding-left:0;padding-right:0}#sousliens{margin-top:3em;margin-bottom:3em;font-size:1.2em;letter-spacing:1px;text-align:left;clear:both}.twilight{line-height:1.1em}.corps{text-align:left;padding:3em 5em;margin:0;clear:both;font-size:1.25em}.corps img{max-width:30em}#address{clear:both}.definitionCell{width:5em;vertical-align:top;font-weight:700;text-align:center}.valueCell{text-align:right}.smallblock{float:left;width:50%;font-size:1em;font-weight:700}.largeblock{float:right;width:70%;font-size:1em}#blackpage,#nojsredirect{top:0;left:0;width:100%;height:100%;margin-left:0;margin-right:0;margin-top:0;margin-bottom:0;position:fixed;text-align:center}#blackpage{color:#666;padding-top:10em;background-color:#eee;z-index:9000;cursor:wait}#blackpage img{background:none;border:none}#blackpage a{cursor:pointer}#nojsredirect{z-index:9001}.nojsbutton{width:50%;padding:1em;border:solid 3px white;margin-left:auto;margin-right:auto;margin-top:2em;z-index:9002}.file{font-size:.8em;text-align:right;float:right;width:80%;margin-right:.3em}.flush{clear:both}table.description{border-spacing:5px;border-collapse:separate;margin-right:auto;margin-left:auto}table.description tr td{padding-left:.5em;padding-right:.5em;padding-top:.5ex;padding-bottom:.5ex;vertical-align:middle;margin-right:5px}ul.long li{margin-bottom:1em}img{display:block;margin-left:auto;margin-right:auto}img.left{float:left;max-width:30%;margin-right:1em}img.inside{display:inline;vertical-align:middle}pre{overflow:hidden}.withfile pre{overflow:hidden;width:96.6%}.navigationprev,.navigationnext{padding:0;margin-left:.2em;margin-right:.2em;margin-bottom:0;margin-top:3em;width:45%}.navigation .navigationprev,.navigation .navigationnext{width:30%;margin-top:0}.navigation{font-size:2em;height:2em;margin-bottom:3em}.presarticleleft,.presarticleright{font-size:1em}.navigationprev{float:left;text-align:left}.navigationnext{float:right;text-align:right}.impact,.darkimpact{text-align:left;width:66%;padding-left:.25em;padding-right:.25em}table.impact{text-align:left}table.impact tr td{padding-left:.25em;padding-right:.25em}#liens{font-size:1.5em}#iemessage{font-size:1.5em}.tag{display:inline;cursor:pointer;margin-left:.5em;margin-right:.5em}.list{margin-top:3em}#menuMessage{font-size:1.2em;line-height:1.5em;width:100%;text-align:center}#choixrss{float:right;width:25%}#entete #choixrss,#entete #choixlang a{margin-top:.3em;height:4em;line-height:4em}#choixlang a{display:block;width:25%;text-align:center}#choix{padding:0;top:3em;display:block;text-align:left;font-size:1em}.date{font-size:.8em}.date,.date .year,.date .month,.date .year{display:block}#next_before_articles{clear:both;width:100%;font-size:1.2em;padding-top:1em;padding-bottom:1em}#previous_articles{float:left;margin-left:1em;width:45%;text-align:left}.previous_article,.next_article{margin-top:1em}#next_articles{float:right;width:45%;margin-right:1em;text-align:right}#choixlang{padding-top:.1em}#choixlang a,#clickcomment{padding:.1em 1em}#clickcomment{margin-left:0;width:25%}#rss{font-size:1.2em;text-align:center;display:block;width:100%;float:right;padding:.1em 1em}.return a{text-align:center;float:right;width:25%;padding:.1em 1em}.corps .return a{color:#eee0c2}.return a:hover{color:#a52}.corps .return a{padding:.1em;line-height:1.5em;font-size:1.5em;height:1.5em;float:left;font-size:2em;margin-top:-0.5em;margin-left:-2em;width:1.5em}.footnotes{font-size:.8em}.fontnotes ol{margin-left:0}.typeset img{display:inline;border:none;margin:0;padding:0}
\ No newline at end of file
+table.description tr td{border:1px solid #eee0c2}.assombris20{background-color:#eee0c2}body{background-image:url("/Scratch/css/img/background.png");color:#fffae3}#content{color:#1a0000;background-color:#fffae3;background-image:url("/Scratch/css/img/mainColor.png")}a,a:link,a:visited,a:active,a:hover,#clickcomment{text-decoration:none;outline:none;color:#630}a:hover,#clickcomment:hover{background-color:#faeac3;background-image:url("/Scratch/css/img/revealColor.png")}hr{color:#510;border-bottom:1px solid #faeac3}ul{list-style:square}h1,h2,h3,h4,h5,h6{font-variant:small-caps}body,h1,h2,h3,h4,#entete,.tag{font-family:Optima,"Century Gothic",Helvetica,Arial,sans-serif;line-height:1.4em}.corps{font-family:Palatino,"Century Schoolbook L","Times New Roman",Times,serif;line-height:1.6em;text-align:justify;background-image:url("/Scratch/css/img/separator.png");background-position:center bottom;background-repeat:no-repeat}pre{background-color:#1a0000;background-image:url("/Scratch/css/img/codeColor.png");color:#fffae3;padding:1em;line-height:1.2em}pre,code{font-family:monaco,monospace;font-size:.7em}p{margin-bottom:1.2em}blockquote{font-style:italic;padding:.5em 1em}abbr,acronym{font-variant:small-caps;text-decoration:none;border-bottom-width:0}#titre{color:#1a0000;background-color:#eee0c2;background-image:url("/Scratch/css/img/secondColor.png");border-top:1px solid#510;border-bottom:1px solid#510}#liens .active,#bottom,#sousliens{color:#1a0000;background-color:#eee0c2;background-image:url("/Scratch/css/img/secondColor.png")}#lastmod{font-size:.8em}.nojsbutton{font-size:2.5em}#clickcomment{cursor:pointer;font-size:1.2em}.small{font-size:.8em}.strong{font-weight:700}.sc{font-variant:small-caps}.impact,.darkimpact{font-size:2em;margin:0 auto 1em auto;line-height:1.3em}h1 > .date{font-size:.6em;color:#510}.date{text-align:center;font-size:.7em;color:#fffae3;width:4.1em;border:1px solid #eee0c2;line-height:1.5em;display:inline-block;border:solid black 1px;position:relative;top:2.75em;left:-5em}.date .day{color:#510;background-color:#fffae3;float:left;width:1.7em}.date .month{border-left:solid#510 .1em;color:#1a0000;background-color:#eee0c2;background-image:url("/Scratch/css/img/secondColor.png");color:#510;float:right;width:2.3em}.date .year{border-top:solid#510 1px;border-bottom:solid#510 1px;line-height:3ex;clear:both;background-color:#510;color:#fffae3}body{text-align:center;font-size:1em}body > #entete{position:relative;left:0;top:.5em;width:100%;min-width:50em;z-index:1800;padding-bottom:1em;margin-bottom:3em}#titre h2{width:80%;margin-left:auto;margin-right:auto;text-align:center}#titre{text-align:center;width:100%;padding-top:1em;padding-bottom:1em}#titre h1,#titre h2{padding-left:1em;padding-right:1em}#bottom{clear:right;margin-right:0;text-align:right;padding:1.5em;line-height:1.5em}#sousliens{padding:1em 0;line-height:2em}#sousliens ul{list-style:none;margin-left:4em}ul.horizontal li{display:inline;font-size:.9em}ul.horizontal{margin-top:0;margin-bottom:0}#entete{padding-top:.1em;border-top:1px solid#510;margin-bottom:2em}#liens{width:100%;padding:0;clear:both;margin-top:.5em}#liens ul{width:100%;clear:both;padding:0;margin:0}#liens ul li{display:inline-block;height:4em;margin-left:.2em;margin-right:.2em;width:23%}#liens ul li a,#liens ul li span{width:100%;display:block;line-height:4em}.clear{clear:both}#content{line-height:4em;margin-left:auto;margin-right:auto;margin-top:0;position:relative;top:-1em;clear:both;width:52em}#content > #choix{margin-top:1em}.encadre,.black,.red,.intro,.resume,.shadow{padding-left:2em;padding-right:2em;margin-top:2em;margin-bottom:2em}.encadre,.black,.red,.shadow{color:#1a0000;background-color:#eee0c2;background-image:url("/Scratch/css/img/secondColor.png")}.intro,.resume{font-size:.9em;font-style:italic}#afterheader > h1{color:#1a0000;background-color:#eee0c2;background-image:url("/Scratch/css/img/secondColor.png");width:100%;padding-bottom:1.5em}#afterheader{padding-left:0;padding-right:0}#sousliens{margin-top:3em;margin-bottom:3em;font-size:1.2em;letter-spacing:1px;text-align:left;clear:both}.twilight{line-height:1.1em}.corps{text-align:left;padding:3em 5em;margin:0;clear:both;font-size:1.25em}.corps img{max-width:30em}#address{clear:both}.definitionCell{width:5em;vertical-align:top;font-weight:700;text-align:center}.valueCell{text-align:right}.smallblock{float:left;width:50%;font-size:1em;font-weight:700}.largeblock{float:right;width:70%;font-size:1em}#blackpage,#nojsredirect{top:0;left:0;width:100%;height:100%;margin-left:0;margin-right:0;margin-top:0;margin-bottom:0;position:fixed;text-align:center}#blackpage{color:#666;padding-top:10em;background-color:#eee;z-index:9000;cursor:wait}#blackpage img{background:none;border:none}#blackpage a{cursor:pointer}#nojsredirect{z-index:9001}.nojsbutton{width:50%;padding:1em;border:solid 3px white;margin-left:auto;margin-right:auto;margin-top:2em;z-index:9002}.file{font-size:.8em;text-align:right;float:right;width:80%;margin-right:.3em}.flush{clear:both}table.description{border-spacing:5px;border-collapse:separate;margin-right:auto;margin-left:auto}table.description tr td{padding-left:.5em;padding-right:.5em;padding-top:.5ex;padding-bottom:.5ex;vertical-align:middle;margin-right:5px}ul.long li{margin-bottom:1em}img{display:block;margin-left:auto;margin-right:auto}img.left{float:left;max-width:30%;margin-right:1em}img.inside{display:inline;vertical-align:middle}pre{overflow:hidden}.withfile pre{overflow:hidden;width:96.6%}.navigationprev,.navigationnext{padding:0;margin-left:.2em;margin-right:.2em;margin-bottom:0;margin-top:3em;width:45%}.navigation .navigationprev,.navigation .navigationnext{width:30%;margin-top:0}.navigation{font-size:2em;height:2em;margin-bottom:3em}.presarticleleft,.presarticleright{font-size:1em}.navigationprev{float:left;text-align:left}.navigationnext{float:right;text-align:right}.impact,.darkimpact{text-align:left;width:66%;padding-left:.25em;padding-right:.25em}table.impact{text-align:left}table.impact tr td{padding-left:.25em;padding-right:.25em}#liens{font-size:1.5em}#iemessage{font-size:1.5em}.tag{display:inline;cursor:pointer;margin-left:.5em;margin-right:.5em}.list{margin-top:3em}#menuMessage{font-size:1.2em;line-height:1.5em;width:100%;text-align:center}#choixrss{float:right;width:25%}#entete #choixrss,#entete #choixlang a{margin-top:.3em;height:4em;line-height:4em}#choixlang a{display:block;width:25%;text-align:center}#choix{padding:0;top:3em;display:block;text-align:left;font-size:1em}.date{font-size:.8em}.date,.date .year,.date .month,.date .year{display:block}#next_before_articles{clear:both;width:100%;font-size:1.2em;padding-top:1em;padding-bottom:1em}#previous_articles{float:left;margin-left:1em;width:45%;text-align:left}.previous_article,.next_article{margin-top:1em}#next_articles{float:right;width:45%;margin-right:1em;text-align:right}#choixlang{padding-top:.1em}#choixlang a,#clickcomment{padding:.1em 1em}#clickcomment{margin-left:0;width:25%}#rss{font-size:1.2em;text-align:center;display:block;width:100%;float:right;padding:.1em 1em}.return a{text-align:center;float:right;width:25%;padding:.1em 1em}.corps .return a{color:#eee0c2}.return a:hover{color:#630}.corps .return a{padding:.1em;line-height:1.5em;font-size:1.5em;height:1.5em;float:left;font-size:2em;margin-top:-0.5em;margin-left:-2em;width:1.5em}.footnotes{font-size:.8em}.fontnotes ol{margin-left:0}.typeset img{display:inline;border:none;margin:0;padding:0}
\ No newline at end of file
diff --git a/output/Scratch/css/img/codeColor.png b/output/Scratch/css/img/codeColor.png
new file mode 100644
index 000000000..9f8ca0642
Binary files /dev/null and b/output/Scratch/css/img/codeColor.png differ
diff --git a/output/Scratch/css/img/mainColor.png b/output/Scratch/css/img/mainColor.png
new file mode 100644
index 000000000..6cbe19a2e
Binary files /dev/null and b/output/Scratch/css/img/mainColor.png differ
diff --git a/output/Scratch/css/img/revealColor.png b/output/Scratch/css/img/revealColor.png
new file mode 100644
index 000000000..31006edf3
Binary files /dev/null and b/output/Scratch/css/img/revealColor.png differ
diff --git a/output/Scratch/css/img/secondColor.png b/output/Scratch/css/img/secondColor.png
new file mode 100644
index 000000000..a6791a8f8
Binary files /dev/null and b/output/Scratch/css/img/secondColor.png differ
diff --git a/output/Scratch/css/img/separator.png b/output/Scratch/css/img/separator.png
index 1447dc693..e54394370 100644
Binary files a/output/Scratch/css/img/separator.png and b/output/Scratch/css/img/separator.png differ
diff --git a/output/Scratch/en/blog/2010-06-19-jQuery-popup-the-easy-way/index.html b/output/Scratch/en/blog/2010-06-19-jQuery-popup-the-easy-way/index.html
index 83ede2ccd..9d7463930 100644
--- a/output/Scratch/en/blog/2010-06-19-jQuery-popup-the-easy-way/index.html
+++ b/output/Scratch/en/blog/2010-06-19-jQuery-popup-the-easy-way/index.html
@@ -191,7 +191,7 @@ No need to use a jQuery
plugin.