Set article compatible with CSS

This commit is contained in:
Yann Esposito (Yogsototh) 2011-07-11 16:36:59 +02:00
parent f96659e597
commit e2bc5066c0
13 changed files with 229 additions and 206 deletions

View file

@ -24,21 +24,12 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1">
<!-- Place favicon.ico & apple-touch-icon.png in the root of your domain and delete these references -->
<link rel="shortcut icon" href="<%=@config[:webprefix]%>/img/favicon.ico" />
<link rel="shortcut icon" href="/img/favicon.ico" />
<link rel="apple-touch-icon" href="/apple-touch-icon.png">
<!-- CSS: blueprint framework -->
<link href="/css/screen.css" media="screen, projection" rel="stylesheet" type="text/css" />
<link href="/css/print.css" media="print" rel="stylesheet" type="text/css" />
<!--[if lt IE 8]>
<link href="/css/ie.css" media="screen, projection" rel="stylesheet" type="text/css" />
<![endif]-->
<!-- CSS: implied media="all" -->
<!-- Google Fonts -->
<link href='http://fonts.googleapis.com/css?family=Expletus+Sans:bold' rel='stylesheet' type='text/css'>
<link href='http://fonts.googleapis.com/css?family=Kreon:regular,bold' rel='stylesheet' type='text/css'>
<link href='http://fonts.googleapis.com/css?family=Molengo:regular,bold' rel='stylesheet' type='text/css'>
<link rel="stylesheet" href="/css/main.css">
<!-- All JavaScript at the bottom, except for Modernizr which enables HTML5 elements & feature detects -->
@ -49,85 +40,79 @@
</head>
<body lang="<%= language %>" class="<%=bodyclass%>">
<header>
<div id="choixrss"><%= choixrss %></div>
<div id="choixlang"><%= choixlang %></div>
<nav id="mainnav">
<div id="container">
<header>
<div id="prelinks">
<div id="choixlang"><%= choixlang %></div>
<div id="choixrss"><%= choixrss %></div>
</div>
<hgroup id="maintitle">
<%= page_title %>
</hgroup>
<nav id="mainnav">
<ul>
<%= generateMenu %>
</ul>
</nav>
</header>
<div id="metacontainer">
<div id="container">
</nav>
</header>
<div id="main" role="main">
<hgroup>
<h1><%= @item[:content_for_title].nil? ? @item[:title] : @item[:content_for_title] %></h1>
<% unless @item[:subtitle].nil? and @item[:content_for_subtitle].nil? %>
<h2>
<%= @item[:content_for_subtitle].nil? ? @item[:subtitle] : @item[:content_for_subtitle] %>
</h2>
<% end %>
</hgroup>
<article>
<div id="main" role="main">
<article>
<div class="content">
<%= yield %>
</div>
<footer>
<ul class="article_metadata">
<li><%=tradOf(:created_at)%>: <time><%= @item[:created_at].strftime(@config[:dateFormat][language.intern]) %></time></li>
<li><%=tradOf(:last_modified)%>: <time> <%= gitmtime.strftime(@config[:dateFormat][language.intern]) %></time></li>
<li><%=tradOf(:copyright) %></li>
</ul>
<ul class="article_metadata">
<li><%=tradOf(:created_at)%>: <time><%= @item[:created_at].strftime(@config[:dateFormat][language.intern]) %></time></li>
<li><%=tradOf(:last_modified)%>: <time> <%= gitmtime.strftime(@config[:dateFormat][language.intern]) %></time></li>
<li><%=tradOf(:copyright) %></li>
</ul>
</footer>
</article>
</article>
</div>
<div id="related_articles">
<div id="previous_articles">
<h4> <%= tradOf(:previousArticles) %> </h4>
<%
(1..3).each do |n|
a=article_brother(-n)
if not a.nil?
%>
<div class="previous_article">
<%= link_to( %{<span class="nicer">«</span>&nbsp;}+ a[:title], a) %>
</div>
<% end %>
<% end %>
</div>
<div id="next_articles">
<h4><%= tradOf(:nextArticles) %></h4>
<%
(1..3).each do |n|
a=article_brother(n)
if not a.nil?
%>
<div id="related_articles">
<div id="previous_articles">
<h4> <%= tradOf(:previousArticles) %> </h4>
<%
(1..3).each do |n|
a=article_brother(-n)
if not a.nil?
%>
<div class="previous_article">
<%= link_to( %{<span class="nicer">«</span>&nbsp;}+ a[:title], a) %>
</div>
<% end %>
<% end %>
</div>
<div id="next_articles">
<h4><%= tradOf(:nextArticles) %></h4>
<%
(1..3).each do |n|
a=article_brother(n)
if not a.nil?
%>
<div class="next_article">
<%= link_to(a[:title] + %{&nbsp;<span class="nicer">»</span>}, a) %>
</div>
<% end %>
<% end %>
<% end %>
</div>
<div class="flush"></div>
</div>
<div class="flush"></div>
</div>
</div> <!--! end of #container -->
</div> <!--! end of #metacontainer -->
<footer>
<div id="webpageinfo">
<%=tradOf(:copyright) %>
<div>
<%= tradOf(:entirely_done_with) %>
<a href="http://www.vim.org">Vim</a>
<%= tradOf(:and) %>
<a href="http://nanoc.stoneship.org">nanoc</a>
<footer>
<div id="webpageinfo">
<%=tradOf(:copyright) %>
<div>
<%= tradOf(:entirely_done_with) %>
<a href="http://www.vim.org">Vim</a>
<%= tradOf(:and) %>
<a href="http://nanoc.stoneship.org">nanoc</a>
</div>
</div>
</div>
</footer>
</footer>
</div> <!--! end of #container -->
<!-- JavaScript at the bottom for fast page loading -->

View file

@ -24,7 +24,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1">
<!-- Place favicon.ico & apple-touch-icon.png in the root of your domain and delete these references -->
<link rel="shortcut icon" href="<%=@config[:webprefix]%>/img/favicon.ico" />
<link rel="shortcut icon" href="/img/favicon.ico" />
<link rel="apple-touch-icon" href="/apple-touch-icon.png">

View file

@ -24,21 +24,12 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1">
<!-- Place favicon.ico & apple-touch-icon.png in the root of your domain and delete these references -->
<link rel="shortcut icon" href="/Scratch/img/favicon.ico" />
<link rel="shortcut icon" href="/img/favicon.ico" />
<link rel="apple-touch-icon" href="/apple-touch-icon.png">
<!-- CSS: blueprint framework -->
<link href="/css/screen.css" media="screen, projection" rel="stylesheet" type="text/css" />
<link href="/css/print.css" media="print" rel="stylesheet" type="text/css" />
<!--[if lt IE 8]>
<link href="/css/ie.css" media="screen, projection" rel="stylesheet" type="text/css" />
<![endif]-->
<!-- CSS: implied media="all" -->
<!-- Google Fonts -->
<link href='http://fonts.googleapis.com/css?family=Expletus+Sans:bold' rel='stylesheet' type='text/css'>
<link href='http://fonts.googleapis.com/css?family=Kreon:regular,bold' rel='stylesheet' type='text/css'>
<link href='http://fonts.googleapis.com/css?family=Molengo:regular,bold' rel='stylesheet' type='text/css'>
<link rel="stylesheet" href="/css/main.css">
<!-- All JavaScript at the bottom, except for Modernizr which enables HTML5 elements & feature detects -->
@ -49,25 +40,24 @@
</head>
<body lang="en" class="std">
<header>
<div id="choixrss"><a id="rss" href="http://feeds.feedburner.com/ypasswordespozitocomen">Subscribe</a></div>
<div id="choixlang"><a href="/Scratch/fr/blog/2011-05-05-Screenshots/" onclick="setLanguage('fr')">en Français</a></div>
<nav id="mainnav">
<div id="container">
<header>
<div id="prelinks">
<div id="choixlang"><a href="/Scratch/fr/blog/2011-05-05-Screenshots/" onclick="setLanguage('fr')">en Français</a></div>
<div id="choixrss"><a id="rss" href="http://feeds.feedburner.com/ypasswordespozitocomen">Subscribe</a></div>
</div>
<hgroup id="maintitle">
<h1>YPassword</h1><h2>Screenshots<h2>
</hgroup>
<nav id="mainnav">
<ul>
<ul><li><a href="/Scratch/en/">YPassword</a></li><li><a href="/Scratch/en/blog/">Blog</a></li><li><a href="/Scratch/en/support/">Support</a></li></ul>
</ul>
</nav>
</header>
<div id="metacontainer">
<div id="container">
</nav>
</header>
<div id="main" role="main">
<hgroup>
<h1>Screenshots</h1>
</hgroup>
<article>
<div id="main" role="main">
<article>
<div class="content">
<div class="intro">
@ -110,46 +100,45 @@ Now you can paste it anywhere.</p>
</div>
<footer>
<ul class="article_metadata">
<li>Created: <time>05/05/2011</time></li>
<li>Modified: <time> 05/14/2011</time></li>
<li><a rel="license" href="http://creativecommons.org/licenses/by-sa/3.0/">Copyright ©, Yann Esposito</a></li>
</ul>
<ul class="article_metadata">
<li>Created: <time>05/05/2011</time></li>
<li>Modified: <time> 05/14/2011</time></li>
<li><a rel="license" href="http://creativecommons.org/licenses/by-sa/3.0/">Copyright ©, Yann Esposito</a></li>
</ul>
</footer>
</article>
</div>
<div id="related_articles">
<div id="previous_articles">
<h4> previous entries </h4>
</article>
</div>
<div id="next_articles">
<h4>next entries</h4>
<div id="related_articles">
<div id="previous_articles">
<h4> previous entries </h4>
</div>
<div id="next_articles">
<h4>next entries</h4>
</div>
<div class="flush"></div>
</div>
<div class="flush"></div>
</div>
<footer>
<div id="webpageinfo">
<a rel="license" href="http://creativecommons.org/licenses/by-sa/3.0/">Copyright ©, Yann Esposito</a>
<div>
Entirely done with
<a href="http://www.vim.org">Vim</a>
and
<a href="http://nanoc.stoneship.org">nanoc</a>
</div>
</div>
</footer>
</div> <!--! end of #container -->
</div> <!--! end of #metacontainer -->
<footer>
<div id="webpageinfo">
<a rel="license" href="http://creativecommons.org/licenses/by-sa/3.0/">Copyright ©, Yann Esposito</a>
<div>
Entirely done with
<a href="http://www.vim.org">Vim</a>
and
<a href="http://nanoc.stoneship.org">nanoc</a>
</div>
</div>
</footer>
<!-- JavaScript at the bottom for fast page loading -->

View file

@ -24,7 +24,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1">
<!-- Place favicon.ico & apple-touch-icon.png in the root of your domain and delete these references -->
<link rel="shortcut icon" href="/Scratch/img/favicon.ico" />
<link rel="shortcut icon" href="/img/favicon.ico" />
<link rel="apple-touch-icon" href="/apple-touch-icon.png">

View file

@ -24,7 +24,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1">
<!-- Place favicon.ico & apple-touch-icon.png in the root of your domain and delete these references -->
<link rel="shortcut icon" href="/Scratch/img/favicon.ico" />
<link rel="shortcut icon" href="/img/favicon.ico" />
<link rel="apple-touch-icon" href="/apple-touch-icon.png">

View file

@ -24,7 +24,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1">
<!-- Place favicon.ico & apple-touch-icon.png in the root of your domain and delete these references -->
<link rel="shortcut icon" href="/Scratch/img/favicon.ico" />
<link rel="shortcut icon" href="/img/favicon.ico" />
<link rel="apple-touch-icon" href="/apple-touch-icon.png">

View file

@ -24,21 +24,12 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1">
<!-- Place favicon.ico & apple-touch-icon.png in the root of your domain and delete these references -->
<link rel="shortcut icon" href="/Scratch/img/favicon.ico" />
<link rel="shortcut icon" href="/img/favicon.ico" />
<link rel="apple-touch-icon" href="/apple-touch-icon.png">
<!-- CSS: blueprint framework -->
<link href="/css/screen.css" media="screen, projection" rel="stylesheet" type="text/css" />
<link href="/css/print.css" media="print" rel="stylesheet" type="text/css" />
<!--[if lt IE 8]>
<link href="/css/ie.css" media="screen, projection" rel="stylesheet" type="text/css" />
<![endif]-->
<!-- CSS: implied media="all" -->
<!-- Google Fonts -->
<link href='http://fonts.googleapis.com/css?family=Expletus+Sans:bold' rel='stylesheet' type='text/css'>
<link href='http://fonts.googleapis.com/css?family=Kreon:regular,bold' rel='stylesheet' type='text/css'>
<link href='http://fonts.googleapis.com/css?family=Molengo:regular,bold' rel='stylesheet' type='text/css'>
<link rel="stylesheet" href="/css/main.css">
<!-- All JavaScript at the bottom, except for Modernizr which enables HTML5 elements & feature detects -->
@ -49,25 +40,24 @@
</head>
<body lang="fr" class="std">
<header>
<div id="choixrss"><a id="rss" href="http://feeds.feedburner.com/ypasswordespozitocomfr">s'abonner</a></div>
<div id="choixlang"><a href="/Scratch/en/blog/2011-05-05-Screenshots/" onclick="setLanguage('en')">in English</a></div>
<nav id="mainnav">
<div id="container">
<header>
<div id="prelinks">
<div id="choixlang"><a href="/Scratch/en/blog/2011-05-05-Screenshots/" onclick="setLanguage('en')">in English</a></div>
<div id="choixrss"><a id="rss" href="http://feeds.feedburner.com/ypasswordespozitocomfr">s'abonner</a></div>
</div>
<hgroup id="maintitle">
<h1>YPassword</h1><h2>Captures d'écran<h2>
</hgroup>
<nav id="mainnav">
<ul>
<ul><li><a href="/Scratch/fr/">YPassword</a></li><li><a href="/Scratch/fr/blog/">Blog</a></li><li><a href="/Scratch/fr/support/">Aide</a></li></ul>
</ul>
</nav>
</header>
<div id="metacontainer">
<div id="container">
</nav>
</header>
<div id="main" role="main">
<hgroup>
<h1>Captures d'écran</h1>
</hgroup>
<article>
<div id="main" role="main">
<article>
<div class="content">
<div class="intro">
@ -109,46 +99,45 @@
</div>
<footer>
<ul class="article_metadata">
<li>Écrit le : <time>05/05/2011</time></li>
<li>modifié le : <time> 14/05/2011</time></li>
<li><a rel="license" href="http://creativecommons.org/licenses/by-sa/3.0/deed.fr">Droits de reproduction ©, Yann Esposito</a></li>
</ul>
<ul class="article_metadata">
<li>Écrit le : <time>05/05/2011</time></li>
<li>modifié le : <time> 14/05/2011</time></li>
<li><a rel="license" href="http://creativecommons.org/licenses/by-sa/3.0/deed.fr">Droits de reproduction ©, Yann Esposito</a></li>
</ul>
</footer>
</article>
</div>
<div id="related_articles">
<div id="previous_articles">
<h4> articles précédents </h4>
</article>
</div>
<div id="next_articles">
<h4>articles suivants</h4>
<div id="related_articles">
<div id="previous_articles">
<h4> articles précédents </h4>
</div>
<div id="next_articles">
<h4>articles suivants</h4>
</div>
<div class="flush"></div>
</div>
<div class="flush"></div>
</div>
<footer>
<div id="webpageinfo">
<a rel="license" href="http://creativecommons.org/licenses/by-sa/3.0/deed.fr">Droits de reproduction ©, Yann Esposito</a>
<div>
Site entièrement réalisé avec
<a href="http://www.vim.org">Vim</a>
et
<a href="http://nanoc.stoneship.org">nanoc</a>
</div>
</div>
</footer>
</div> <!--! end of #container -->
</div> <!--! end of #metacontainer -->
<footer>
<div id="webpageinfo">
<a rel="license" href="http://creativecommons.org/licenses/by-sa/3.0/deed.fr">Droits de reproduction ©, Yann Esposito</a>
<div>
Site entièrement réalisé avec
<a href="http://www.vim.org">Vim</a>
et
<a href="http://nanoc.stoneship.org">nanoc</a>
</div>
</div>
</footer>
<!-- JavaScript at the bottom for fast page loading -->

View file

@ -24,7 +24,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1">
<!-- Place favicon.ico & apple-touch-icon.png in the root of your domain and delete these references -->
<link rel="shortcut icon" href="/Scratch/img/favicon.ico" />
<link rel="shortcut icon" href="/img/favicon.ico" />
<link rel="apple-touch-icon" href="/apple-touch-icon.png">

View file

@ -24,7 +24,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1">
<!-- Place favicon.ico & apple-touch-icon.png in the root of your domain and delete these references -->
<link rel="shortcut icon" href="/Scratch/img/favicon.ico" />
<link rel="shortcut icon" href="/img/favicon.ico" />
<link rel="apple-touch-icon" href="/apple-touch-icon.png">

View file

@ -24,7 +24,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1">
<!-- Place favicon.ico & apple-touch-icon.png in the root of your domain and delete these references -->
<link rel="shortcut icon" href="/Scratch/img/favicon.ico" />
<link rel="shortcut icon" href="/img/favicon.ico" />
<link rel="apple-touch-icon" href="/apple-touch-icon.png">

View file

@ -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%;
}

View file

@ -24,7 +24,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1">
<!-- Place favicon.ico & apple-touch-icon.png in the root of your domain and delete these references -->
<link rel="shortcut icon" href="/Scratch/img/favicon.ico" />
<link rel="shortcut icon" href="/img/favicon.ico" />
<link rel="apple-touch-icon" href="/apple-touch-icon.png">

View file

@ -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%