Skip to content

Commit 2148e3a

Browse files
mklabsmklabs
committed
further work on layouts, almost done
1 parent e7c578b commit 2148e3a

22 files changed

+558
-16
lines changed

‎_layouts/default.html‎

Lines changed: 52 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<meta name="author" content="">
1717

1818
<!-- Mobile viewport optimized: j.mp/bplateviewport -->
19-
<meta name="viewport" content="width=device-width,initial-scale=1">
19+
<meta name="viewport" content="width=device-width,initial-scale=1">
2020

2121
<!-- CSS: implied media=all -->
2222
<!-- CSS concatenated and minified via ant build script-->
@@ -34,14 +34,63 @@
3434
<body>
3535

3636
<div id="container">
37-
<header>
37+
<header class="header">
3838
<h1><a href="/"><img src="/public/img/pullrequest-logo.png" alt="Pull Request"/></a></h1>
3939
</header>
4040

4141
<div id="main" role="main">
42-
{{ content }}
42+
<div id="sticky-wrapper">
43+
<section id="main-content">
44+
{{ content }}
45+
</section>
46+
47+
<aside>
48+
<!--
49+
<section class="about">
50+
<h1>About</h1>
51+
<p>Pull Request, c'est un blog ... &lt;placer la suite ici&gt;</p>
52+
</section>
53+
-->
54+
<section class="about">
55+
<h1>A propos</h1>
56+
<p>PullRequest est un blog de développeur ouvert à toute contribution que nous jugerons intéressante.</p>
57+
</section>
58+
<section class="follow">
59+
<h1>Suivez nous!</h1>
60+
<ul>
61+
<li><a href="http://twitter.com/pullrequest">Sur Twitter</a></li>
62+
<li><a rel="alternate" type="application/rss+xml" href="http://feeds.feedburner.com/pullrequest/blog-posts">Via RSS</a></li>
63+
</ul>
64+
</section>
65+
<section id="participate">
66+
<h1>Participer</h1>
67+
<p>Les articles sont écrits en <a href="http://daringfireball.net/projects/markdown/syntax">MarkDown</a> et stock&eacute;s dans un repository Git sur <a href="http://github.com/pullrequest/pullrequest.org">Github</a>.
68+
N'h&eacute;sitez pas &agrave; <strong>forker</strong> puis à faire une <strong><a href="https://github.com/pullrequest/pullrequest.org/pull/new/master">Pull Request</a></strong> ;)</p>
69+
</section>
70+
<section class="licensing">
71+
<h1>Licence</h1>
72+
<p>
73+
Les articles sont mis à disposition selon les termes de la <a rel="license" href="http://creativecommons.org/licenses/by/2.0/fr/">Licence Creative Commons Paternité 2.0 France</a>.
74+
<a rel="license" href="http://creativecommons.org/licenses/by/2.0/fr/">
75+
<br><img alt="Contrat Creative Commons" style="border-width:0" src="http://i.creativecommons.org/l/by/2.0/fr/88x31.png" />
76+
</a>
77+
</p>
78+
</section>
79+
<section id="opensource">
80+
<h1>OpenSource</h1>
81+
<p>Les auteurs de PullRequest sont à l'origine, ou contributeurs, entre autre, de ces projets:</p>
82+
<a href="http://openscales.org">OpenScales</a>
83+
<a href="http://resthub.org">RestHub</a>
84+
<a href="https://github.com/loicfrering/losolib">LoSoLib</a>
85+
<a href="https://bitbucket.org/feugy/myth">Myth</a>
86+
</section>
87+
</aside>
88+
89+
</div>
4390
</div>
4491

92+
93+
4594
<footer>
4695
<small id="legal">&copy; 2011 pullrequest.org</small>—
4796
<small id="poweredby">Propuls&eacute; par <a href="https://github.com/mojombo/jekyll">Jekyll</a></small>

‎images/pullrequest-logo.png‎

-2.12 KB
Binary file not shown.

‎public/css/style.css‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ body{
107107
font-family: CallunaSansRegular, sans-serif;
108108
height: 100%;
109109
line-height: 24px;
110-
background: url('../images/background-pattern.gif');
110+
background: url('../img/background-pattern.gif');
111111
}
112112

113113
article h1, h2{
@@ -152,22 +152,22 @@ pre{
152152

153153
/* - Site header ------------------------------------------------------------ */
154154

155-
body header{
155+
body header.header{
156156

157157
background: #252b33;
158158
height: 96px;
159159
position:relative;
160160
z-index: 2;
161161
}
162162

163-
body header h1{
163+
body header.header h1{
164164

165165
margin: auto;
166166
padding-top: 15px;
167167
width: 252px;
168168
}
169169

170-
body header h1 a:hover{
170+
body header.header h1 a:hover{
171171
border:none;
172172
}
173173

@@ -214,7 +214,7 @@ article img{
214214

215215
.author, .publishing, .category, .comments{
216216

217-
background: url('../images/sprite.png') 0 -17px no-repeat;
217+
background: url('../img/sprite.png') 0 -17px no-repeat;
218218
padding-left: 20px;
219219
font-size: 12px;
220220
}
@@ -250,7 +250,7 @@ article img{
250250

251251
.read-more{
252252

253-
background: url('../images/sprite.png') right -61px no-repeat;
253+
background: url('../img/sprite.png') right -61px no-repeat;
254254
padding-right: 8px;
255255
color: #480c28;
256256
}
@@ -281,7 +281,7 @@ article header{
281281
width: 168px;
282282
padding-left: 8px;
283283
padding-right: 3px;
284-
background: #fafafa url('../images/commit-dot.png') 0 8px no-repeat;
284+
background: #fafafa url('../img/commit-dot.png') 0 8px no-repeat;
285285
color: #b8c7cc;
286286
}
287287

@@ -295,7 +295,7 @@ a.github-changeset:hover{
295295

296296
aside{
297297

298-
width: 190px;
298+
width: 185px;
299299
vertical-align: top;
300300
margin-top: 125px;
301301
margin-left: 48px;
@@ -358,7 +358,7 @@ aside nav{
358358
#main-content:before{
359359

360360
content: '';
361-
background: transparent url('../images/pixel-borders-right.gif') no-repeat right -36px;
361+
background: transparent url('../img/pixel-borders-right.gif') no-repeat right -36px;
362362
display:block;
363363
height: 36px;
364364
position: relative;
@@ -373,7 +373,7 @@ aside nav{
373373
position: relative;
374374
top: 70px;
375375
height: 36px;
376-
background: url('../images/pixel-borders-left.gif') no-repeat left -36px;
376+
background: url('../img/pixel-borders-left.gif') no-repeat left -36px;
377377
margin-bottom: -36px;
378378
z-index: 3;
379379
}
@@ -386,7 +386,7 @@ aside nav{
386386
top: -36px;
387387
margin-bottom: -72px;
388388
height: 36px;
389-
background: url('../images/pixel-borders-right.gif') no-repeat right 0px;
389+
background: url('../img/pixel-borders-right.gif') no-repeat right 0px;
390390
z-index: 3;
391391
}
392392

@@ -398,7 +398,7 @@ aside nav{
398398
top: -18px;
399399
height: 36px;
400400
margin-bottom: -36px;
401-
background: url('../images/pixel-borders-left.gif') no-repeat left 0px;
401+
background: url('../img/pixel-borders-left.gif') no-repeat left 0px;
402402
z-index: 3;
403403
}
404404

@@ -462,7 +462,7 @@ body footer{
462462
line-height: 24px;
463463
padding-bottom: 5px;
464464
margin: 6px 0;
465-
background: url('../images/article-nav-sprite.png') no-repeat;
465+
background: url('../img/article-nav-sprite.png') no-repeat;
466466
}
467467

468468
a.previous-posts{

‎public/fonts/callunasansregular-webfont.eot‎

27.8 KB
Binary file not shown.

0 commit comments

Comments
 (0)