yogsototh/scratch
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'next'

Browse source 
* next:
  hopefully more readable css
  trying the bold font again
  updated mathjax rendering
  removed ending whitespaces
This commit is contained in:
Yann Esposito 2012-10-10 11:51:51 +02:00
commit 68c2c38918
3 changed files with 47 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
content/css/main.sass
View file

@ -212,8 +212,9 @@ ul
ol,ul ol,ul
padding-left: 0 padding-left: 0
ol li, ul li .toc
margin: .5em 0 ol li, ul li
margin: .5em 0
ol li ul, ol li ol, ul li ol, ul li ul ol li ul, ol li ol, ul li ol, ul li ul
margin: .5em 1.5em margin: .5em 1.5em
list-style: none 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 body, h1, h2, h3, h4, #entete, .tagname
text-rendering: optimizelegibility text-rendering: optimizelegibility
line-height: 1.4em line-height: 1.5em
body body
font-family: "ComputerModern", Georgia, Palatino, "Century Schoolbook L", "Times New Roman", Times, serif 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 box-shadow: 0 0 5px ($secondBackgroundColor - #222) inset
border-radius: 3px border-radius: 3px
padding: 1em padding: 1em
line-height: 1.2em line-height: 1em
font-size: .9em font-size: .9em
p p
@ -560,11 +561,23 @@ $fontcorps: 1.25
.corps .corps
font-size: #{$fontcorps}em font-size: #{$fontcorps}em
line-height: 1.6em line-height: 1.5em
text-align: justify text-align: justify
padding: $VPadCorps 3em padding: $VPadCorps 3em
margin: 0 $HMarginCorps margin: 0 $HMarginCorps
clear: both 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 $corps_width: ($content_width - 2 * $contentMargin) / $fontcorps
$hpadding: 1 $hpadding: 1
@ -875,7 +888,6 @@ a.return
padding: 0 padding: 0
strong, b, i, em strong, b, i, em
font-weight: normal
color: $highlightColor color: $highlightColor
a a
color: $mainTextColor color: $mainTextColor

56
layouts/article.html
View file

@ -5,30 +5,30 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" lang="fr" xml:lang="fr"> <html xmlns="http://www.w3.org/1999/xhtml" lang="fr" xml:lang="fr">
<head> <head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><%
<% t=tags %> t=tags
<% if t.length > 0 %> if t.length > 0
<meta name="keywords" content="<%= t %>"> %> <meta name="keywords" content="<%= t %>"><%
<% end %> end
<link rel="shortcut icon" type="image/x-icon" href="<%=@config[:webprefix]%>/img/favicon.ico" /> %> <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]%>/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/solarized.css" />
<link rel="stylesheet" type="text/css" href="<%=@config[:webprefix]%>/css/idc.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 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| languages.each do |lang|
item_for_lang=item_of_language(lang) item_for_lang=item_of_language(lang)
if not item_for_lang.nil? %> 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 %>" /> <% <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
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-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/jquery.cookie.js"></script>
<script type="text/javascript" src="<%=@config[:webprefix]%>/js/index.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/highlight/highlight.pack.js"></script>
<script type="text/javascript" src="<%=@config[:webprefix]%>/js/article.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 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]> <!--[if lt IE 9]>
<script src="http://ie7-js.googlecode.com/svn/version/2.1(beta4)/IE9.js"></script> <script src="http://ie7-js.googlecode.com/svn/version/2.1(beta4)/IE9.js"></script>
<![endif]--> <![endif]-->
@ -41,11 +41,11 @@
</script> </script>
<div id="content"> <div id="content">
<div id="choix"> <div id="choix">
<div class="return"><a href="#entete">&darr; Menu &darr;</a></div> <div class="return"><a href="#entete">&darr; Menu &darr;</a></div>
<div id="choixlang"><%= <div id="choixlang"><%=
languages.map do |l| 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 if @item_rep.path != dest
%{<a href="#{dest}" onclick="setLanguage('#{l}')">#{ tradOfKeywordIn(:switchTo,l)}</a>} %{<a href="#{dest}" onclick="setLanguage('#{l}')">#{ tradOfKeywordIn(:switchTo,l)}</a>}
else else
@ -59,9 +59,9 @@
<h1> <h1>
<%= @item[:title] %> <%= @item[:title] %>
</h1> </h1>
<% unless @item[:subtitle].nil? %> <% unless @item[:subtitle].nil? %>
<h2> <h2>
<%= @item[:subtitle] %> <%= @item[:subtitle] %>
</h2> </h2>
<% end %> <% end %>
</div> </div>
@ -100,9 +100,9 @@
</a> </a>
</div> </div>
<script type="text/javascript"> <script type="text/javascript">
$(document).ready(function(){ $(document).ready(function(){
$('#comment').hide(); $('#comment').hide();
$('#clickcomment').click(showComments); $('#clickcomment').click(showComments);
}); });
function showComments() { function showComments() {
$('#comment').show(); $('#comment').show();
@ -129,7 +129,7 @@
<div id="next_before_articles"> <div id="next_before_articles">
<div id="previous_articles"> <div id="previous_articles">
<%= tradOf(:previousArticles) %> <%= tradOf(:previousArticles) %>
<% <%
(1..3).each do |n| (1..3).each do |n|
a=article_brother(-n) a=article_brother(-n)
if not a.nil? if not a.nil?
@ -142,7 +142,7 @@
</div> </div>
<div id="next_articles"> <div id="next_articles">
<%= tradOf(:nextArticles) %> <%= tradOf(:nextArticles) %>
<% <%
(1..3).each do |n| (1..3).each do |n|
a=article_brother(n) a=article_brother(n)
if not a.nil? if not a.nil?
@ -167,12 +167,12 @@
</div> </div>
<div id="lastmod"> <div id="lastmod">
<%=tradOf(:created_at)%>: <%= @item[:created_at].strftime(@config[:dateFormat][language.intern]) %> <%=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>
<div> <div>
<%= tradOf(:entirely_done_with) %> <%= tradOf(:entirely_done_with) %>
<a href="http://www.vim.org">Vim</a> <a href="http://www.vim.org">Vim</a>
<%= tradOf(:and) %> <%= tradOf(:and) %>
<a href="http://nanoc.stoneship.org">nanoc</a> <a href="http://nanoc.stoneship.org">nanoc</a>
</div> </div>
</div> </div>

2
tasks/devel-clean.sh
View file

@ -9,7 +9,7 @@ for fic in $webroot/content/html/??/blog/*(N); do
done done
print -- "Clean multi/blog" print -- "Clean multi/blog"
if [[ $(uname) = Linux ]]; then if [[ $(uname) = Linux ]]; then
column=8 column=9
else else
column=9 column=9
fi fi