diff --git a/layouts/article.html b/layouts/article.html index cd2289a..3429755 100644 --- a/layouts/article.html +++ b/layouts/article.html @@ -24,21 +24,12 @@ - + - - - - - - - - + @@ -49,85 +40,79 @@ -
-
<%= choixrss %>
-
<%= choixlang %>
- +
-
-
-

<%= @item[:content_for_title].nil? ? @item[:title] : @item[:content_for_title] %>

- <% unless @item[:subtitle].nil? and @item[:content_for_subtitle].nil? %> -

- <%= @item[:content_for_subtitle].nil? ? @item[:subtitle] : @item[:content_for_subtitle] %> -

- <% end %> -
- -
+
+
<%= yield %>
-
+
-
- - - + + diff --git a/layouts/main.html b/layouts/main.html index 1a90bf6..2f0d5e2 100644 --- a/layouts/main.html +++ b/layouts/main.html @@ -24,7 +24,7 @@ - + diff --git a/site/Scratch/en/blog/2011-05-05-Screenshots/index.html b/site/Scratch/en/blog/2011-05-05-Screenshots/index.html index 0d9330c..88a2adb 100644 --- a/site/Scratch/en/blog/2011-05-05-Screenshots/index.html +++ b/site/Scratch/en/blog/2011-05-05-Screenshots/index.html @@ -24,21 +24,12 @@ - + - - - - - - - - + @@ -49,25 +40,24 @@ -
-
Subscribe
-
en Français
- +
-
-
-

Screenshots

- -
- -
+
+ +
-
- - - diff --git a/site/Scratch/en/blog/index.html b/site/Scratch/en/blog/index.html index a6383e9..7ae07c6 100644 --- a/site/Scratch/en/blog/index.html +++ b/site/Scratch/en/blog/index.html @@ -24,7 +24,7 @@ - + diff --git a/site/Scratch/en/index.html b/site/Scratch/en/index.html index 34db8c8..0fb6356 100644 --- a/site/Scratch/en/index.html +++ b/site/Scratch/en/index.html @@ -24,7 +24,7 @@ - + diff --git a/site/Scratch/en/support/index.html b/site/Scratch/en/support/index.html index 851408b..1b1d79a 100644 --- a/site/Scratch/en/support/index.html +++ b/site/Scratch/en/support/index.html @@ -24,7 +24,7 @@ - + diff --git a/site/Scratch/fr/blog/2011-05-05-Screenshots/index.html b/site/Scratch/fr/blog/2011-05-05-Screenshots/index.html index 76948f3..ac13ed3 100644 --- a/site/Scratch/fr/blog/2011-05-05-Screenshots/index.html +++ b/site/Scratch/fr/blog/2011-05-05-Screenshots/index.html @@ -24,21 +24,12 @@ - + - - - - - - - - + @@ -49,25 +40,24 @@ -
-
s'abonner
-
in English
- +
-
-
-

Captures d'écran

- -
- -
+
+ +
-
- - - diff --git a/site/Scratch/fr/blog/index.html b/site/Scratch/fr/blog/index.html index dd73fc7..c5bfd6c 100644 --- a/site/Scratch/fr/blog/index.html +++ b/site/Scratch/fr/blog/index.html @@ -24,7 +24,7 @@ - + diff --git a/site/Scratch/fr/index.html b/site/Scratch/fr/index.html index 34c1dd3..395a900 100644 --- a/site/Scratch/fr/index.html +++ b/site/Scratch/fr/index.html @@ -24,7 +24,7 @@ - + diff --git a/site/Scratch/fr/support/index.html b/site/Scratch/fr/support/index.html index c77cbfb..4b8a15c 100644 --- a/site/Scratch/fr/support/index.html +++ b/site/Scratch/fr/support/index.html @@ -24,7 +24,7 @@ - + diff --git a/site/css/main.css b/site/css/main.css index de4f894..ea71b32 100644 --- a/site/css/main.css +++ b/site/css/main.css @@ -406,21 +406,45 @@ body.std #main > article > *, .slideshow > * { } /* line 243, ../src/main.sass */ +img.left { + float: left; + padding: 10px; + max-width: 10em; + background-color: #e3e5ed; + -moz-box-shadow: white 0 0 3px, rgba(0, 0, 0, 0.2) 0 0 3px inset; + -webkit-box-shadow: white 0 0 3px, rgba(0, 0, 0, 0.2) 0 0 3px inset; + -o-box-shadow: white 0 0 3px, rgba(0, 0, 0, 0.2) 0 0 3px inset; + box-shadow: white 0 0 3px, rgba(0, 0, 0, 0.2) 0 0 3px inset; + -moz-border-radius: 5px; + -webkit-border-radius: 5px; + -o-border-radius: 5px; + -ms-border-radius: 5px; + -khtml-border-radius: 5px; + border-radius: 5px; + margin: 0 1em; + background: rgba(239, 239, 244, 0.2); +} +/* line 122, ../src/main.sass */ +img.left > * { + margin: 20px; +} + +/* line 251, ../src/main.sass */ ul.article_metadata { list-style-type: none; text-align: right; color: #b4b8c5; } -/* line 247, ../src/main.sass */ +/* line 255, ../src/main.sass */ ul.article_metadata a { color: #9ca1ad; } -/* line 249, ../src/main.sass */ +/* line 257, ../src/main.sass */ ul.article_metadata a:hover { color: #315896; } -/* line 252, ../src/main.sass */ +/* line 260, ../src/main.sass */ #tagcloud { background: #efeff4; padding: 2em; @@ -438,12 +462,12 @@ ul.article_metadata a:hover { margin: 0 auto; } -/* line 260, ../src/main.sass */ +/* line 268, ../src/main.sass */ #elementblock { width: 600px; margin: 0 auto 4em auto; } -/* line 263, ../src/main.sass */ +/* line 271, ../src/main.sass */ #elementblock ul.menu { background-color: #efeff4; -moz-box-shadow: white 0 0 3px, rgba(0, 0, 0, 0.2) 0 0 3px inset; @@ -460,7 +484,7 @@ ul.article_metadata a:hover { padding: 10px; list-style-type: none; } -/* line 270, ../src/main.sass */ +/* line 278, ../src/main.sass */ #elementblock ul.menu li { display: inline-block; text-align: center; @@ -513,3 +537,20 @@ ul.article_metadata a:hover { -o-box-shadow: rgba(0, 0, 0, 0.3) 0 1px 3px inset, rgba(255, 255, 255, 0.3) 0 1px 3px inset; box-shadow: rgba(0, 0, 0, 0.3) 0 1px 3px inset, rgba(255, 255, 255, 0.3) 0 1px 3px inset; } + +/* line 285, ../src/main.sass */ +#related_articles { + width: 960px; + margin: 3em auto; +} +/* line 288, ../src/main.sass */ +#related_articles #previous_articles { + float: left; + width: 40%; +} +/* line 291, ../src/main.sass */ +#related_articles #next_articles { + float: right; + text-align: right; + width: 40%; +} diff --git a/site/index.html b/site/index.html index 34db8c8..0fb6356 100644 --- a/site/index.html +++ b/site/index.html @@ -24,7 +24,7 @@ - + diff --git a/site/src/main.sass b/site/src/main.sass index 74a1cf9..8964099 100644 --- a/site/src/main.sass +++ b/site/src/main.sass @@ -240,6 +240,14 @@ body.std #main > article, .slideshow .rightimage float: right +img.left + float: left + padding: 10px + max-width: 10em + +innerblock + margin: 0 1em + background: rgba($ycolorb,.2) + ul.article_metadata list-style-type: none text-align: right @@ -273,3 +281,14 @@ ul.article_metadata width: ($navWidth - 150px)/3 margin: 0 20px +ybutton + +#related_articles + width: $stdWidth + margin: 3em auto + #previous_articles + float: left + width: 40% + #next_articles + float: right + text-align: right + width: 40%