Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch 'master' of github.com:yogsototh/Scratch

  • Loading branch information...
commit 13a3384b10088621f5526fc7c77e95e765390a1e 2 parents bc8bbf7 + 68c2c38
@yogsototh authored
Showing with 47 additions and 35 deletions.
  1. +18 −6 content/css/main.sass
  2. +28 −28 layouts/article.html
  3. +1 −1  tasks/devel-clean.sh
View
24 content/css/main.sass
@@ -212,8 +212,9 @@ ul
ol,ul
padding-left: 0
-ol li, ul li
- margin: .5em 0
+.toc
+ ol li, ul li
+ margin: .5em 0
ol li ul, ol li ol, ul li ol, ul li ul
margin: .5em 1.5em
list-style: none
@@ -221,7 +222,7 @@ ol li ul, ol li ol, ul li ol, ul li ul
body, h1, h2, h3, h4, #entete, .tagname
text-rendering: optimizelegibility
- line-height: 1.4em
+ line-height: 1.5em
body
font-family: "ComputerModern", Georgia, Palatino, "Century Schoolbook L", "Times New Roman", Times, serif
@@ -250,7 +251,7 @@ pre
box-shadow: 0 0 5px ($secondBackgroundColor - #222) inset
border-radius: 3px
padding: 1em
- line-height: 1.2em
+ line-height: 1em
font-size: .9em
p
@@ -560,11 +561,23 @@ $fontcorps: 1.25
.corps
font-size: #{$fontcorps}em
- line-height: 1.6em
+ line-height: 1.5em
text-align: justify
padding: $VPadCorps 3em
margin: 0 $HMarginCorps
clear: both
+ p, ol, ul, blockquote, pre, code
+ margin-top: 1.5em
+ margin-bottom: 1.5em
+ pre code
+ margin: 0
+ p, ol, ul, blockquote
+ line-height: 1.5em
+ pre, code
+ line-height: 1em
+ ul li ul, ol li ul, ul li ol, ol li ol
+ margin-top: 0
+ margin-bottom: 0
$corps_width: ($content_width - 2 * $contentMargin) / $fontcorps
$hpadding: 1
@@ -875,7 +888,6 @@ a.return
padding: 0
strong, b, i, em
- font-weight: normal
color: $highlightColor
a
color: $mainTextColor
View
56 layouts/article.html
@@ -5,30 +5,30 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" lang="fr" xml:lang="fr">
<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
- <% t=tags %>
- <% if t.length > 0 %>
- <meta name="keywords" content="<%= t %>">
- <% end %>
- <link rel="shortcut icon" type="image/x-icon" href="<%=@config[:webprefix]%>/img/favicon.ico" />
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><%
+ t=tags
+ if t.length > 0
+%> <meta name="keywords" content="<%= t %>"><%
+ end
+%> <link rel="shortcut icon" type="image/x-icon" href="<%=@config[:webprefix]%>/img/favicon.ico" />
<link rel="stylesheet" type="text/css" href="<%=@config[:webprefix]%>/assets/css/main.css" />
<link rel="stylesheet" type="text/css" href="<%=@config[:webprefix]%>/css/solarized.css" />
<link rel="stylesheet" type="text/css" href="<%=@config[:webprefix]%>/css/idc.css" />
<link href='http://fonts.googleapis.com/css?family=Inconsolata' rel='stylesheet' type='text/css'>
- <link rel="alternate" type="application/rss+xml" title="RSS" href="http://feeds.feedburner.com/yannespositocom<%= language %>"/>
- <%
+ <link rel="alternate" type="application/rss+xml" title="RSS" href="http://feeds.feedburner.com/yannespositocom<%= language %>"/><%
languages.each do |lang|
- item_for_lang=item_of_language(lang)
- if not item_for_lang.nil? %>
- <link rel="alternate" lang="<%= lang %>" xml:lang="<%= lang %>" title="<%= item_for_lang[:title] %>" type="text/html" hreflang="<%= lang %>" href="<%= item_for_lang.reps[0].path %>" /> <%
- end
- end %>
- <script type="text/javascript" src="<%=@config[:webprefix]%>/js/jquery-1.3.1.min.js"></script>
+ item_for_lang=item_of_language(lang)
+ if not item_for_lang.nil? %>
+ <link rel="alternate" lang="<%= lang %>" xml:lang="<%= lang %>" title="<%= item_for_lang[:title] %>" type="text/html" hreflang="<%= lang %>" href="<%= item_for_lang.reps[0].path %>" /> <%
+ end
+ end
+%> <script type="text/javascript" src="<%=@config[:webprefix]%>/js/jquery-1.3.1.min.js"></script>
<script type="text/javascript" src="<%=@config[:webprefix]%>/js/jquery.cookie.js"></script>
<script type="text/javascript" src="<%=@config[:webprefix]%>/js/index.js"></script>
- <script type="text/javascript" src="<%=@config[:webprefix]%>/js/highlight/highlight.pack.js"></script>
- <script type="text/javascript" src="<%=@config[:webprefix]%>/js/article.js"></script>
+ <script type="text/javascript" src="<%=@config[:webprefix]%>/js/highlight/highlight.pack.js"></script>
+ <script type="text/javascript" src="<%=@config[:webprefix]%>/js/article.js"></script>
<script type="text/javascript" src="http://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script>
+ <script>MathJax.Hub.Config({"HTML-CSS":{scale:83}});</script>
<!--[if lt IE 9]>
<script src="http://ie7-js.googlecode.com/svn/version/2.1(beta4)/IE9.js"></script>
<![endif]-->
@@ -41,11 +41,11 @@
</script>
<div id="content">
- <div id="choix">
+ <div id="choix">
<div class="return"><a href="#entete">&darr; Menu &darr;</a></div>
- <div id="choixlang"><%=
+ <div id="choixlang"><%=
languages.map do |l|
- dest=@item_rep.path.sub(%r{#{@config[:webprefix]}/../}, %{#{config[:webprefix]}/#{l}/})
+ dest=@item_rep.path.sub(%r{#{@config[:webprefix]}/../}, %{#{config[:webprefix]}/#{l}/})
if @item_rep.path != dest
%{<a href="#{dest}" onclick="setLanguage('#{l}')">#{ tradOfKeywordIn(:switchTo,l)}</a>}
else
@@ -59,9 +59,9 @@
<h1>
<%= @item[:title] %>
</h1>
- <% unless @item[:subtitle].nil? %>
+ <% unless @item[:subtitle].nil? %>
<h2>
- <%= @item[:subtitle] %>
+ <%= @item[:subtitle] %>
</h2>
<% end %>
</div>
@@ -100,9 +100,9 @@
</a>
</div>
<script type="text/javascript">
- $(document).ready(function(){
- $('#comment').hide();
- $('#clickcomment').click(showComments);
+ $(document).ready(function(){
+ $('#comment').hide();
+ $('#clickcomment').click(showComments);
});
function showComments() {
$('#comment').show();
@@ -129,7 +129,7 @@ <h2 class="first"><%= tradOf(:comment) %></h2>
<div id="next_before_articles">
<div id="previous_articles">
<%= tradOf(:previousArticles) %>
- <%
+ <%
(1..3).each do |n|
a=article_brother(-n)
if not a.nil?
@@ -142,7 +142,7 @@ <h2 class="first"><%= tradOf(:comment) %></h2>
</div>
<div id="next_articles">
<%= tradOf(:nextArticles) %>
- <%
+ <%
(1..3).each do |n|
a=article_brother(n)
if not a.nil?
@@ -167,12 +167,12 @@ <h2 class="first"><%= tradOf(:comment) %></h2>
</div>
<div id="lastmod">
<%=tradOf(:created_at)%>: <%= @item[:created_at].strftime(@config[:dateFormat][language.intern]) %>
- <%=tradOf(:last_modified)%>: <%= gitmtime.strftime(@config[:dateFormat][language.intern]) %>
+ <%=tradOf(:last_modified)%>: <%= gitmtime.strftime(@config[:dateFormat][language.intern]) %>
</div>
<div>
<%= tradOf(:entirely_done_with) %>
<a href="http://www.vim.org">Vim</a>
- <%= tradOf(:and) %>
+ <%= tradOf(:and) %>
<a href="http://nanoc.stoneship.org">nanoc</a>
</div>
</div>
View
2  tasks/devel-clean.sh
@@ -9,7 +9,7 @@ for fic in $webroot/content/html/??/blog/*(N); do
done
print -- "Clean multi/blog"
if [[ $(uname) = Linux ]]; then
- column=8
+ column=9
else
column=9
fi
Please sign in to comment.
Something went wrong with that request. Please try again.