Skip to content

Commit aad849c

Browse files
qrushqrush
committed
Changing to TPW blog format
1 parent 2c13355 commit aad849c

File tree

4 files changed

+212
-122
lines changed

4 files changed

+212
-122
lines changed

‎_layouts/default.html

+21-20
Original file line numberDiff line numberDiff line change
@@ -7,32 +7,33 @@
77
<title>{{ page.title }}</title>
88
<meta name="author" content="Nick Quaranto" />
99

10-
<link rel="stylesheet" href="/css/reset.css" type="text/css" media="screen, projection" />
11-
<link rel="stylesheet" href="/css/text.css" type="text/css" media="screen, projection" />
1210
<link rel="stylesheet" href="/css/960.css" type="text/css" media="screen, projection" />
11+
<link rel="stylesheet" href="/css/syntax.css" type="text/css" media="screen, projection" />
1312
<link rel="stylesheet" href="/css/screen.css" type="text/css" media="screen, projection" />
1413
</head>
1514
<body>
16-
<div class="wrapper">
17-
<div id="header">
18-
<h1>
19-
<a href="/">git ready</a>
20-
</h1>
21-
tutorials for the noob to the guru
15+
<div class="site">
16+
<div class="title">
17+
<a href="/">git ready</a>
18+
<span class="extra">daily tips for the noob to the guru</span>
2219
</div>
23-
<div id="main">
24-
{{ content }}
20+
21+
{{ content }}
22+
23+
<div class="footer">
24+
<div class="contact">
25+
<p>
26+
<a href="/about.html">about</a><br />
27+
<a href="http://github.com/qrush/gitready">contribute</a><br />
28+
<a href="/">submit a tip</a>
29+
</p>
30+
</div>
31+
<div class="rss">
32+
<a href="http://feeds.feedburner.com/">
33+
<img src="/images/rss.png" alt="Subscribe to RSS Feed" />
34+
</a>
35+
</div>
2536
</div>
26-
<div class="push"></div>
27-
</div>
28-
<div class="footer">
29-
<a href="about.html">about</a>
30-
&plusmn;
31-
<a href="http://github.com/qrush/gitready">contribute</a>
32-
&plusmn;
33-
<a href="http://git-scm.com">git-scm</a>
34-
&plusmn;
35-
<a href="http://github.com">github</a>
3637
</div>
3738
</body>
3839
</html>

‎atom.xml

+27
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
---
2+
layout: nil
3+
---
4+
<?xml version="1.0" encoding="utf-8"?>
5+
<feed xmlns="http://www.w3.org/2005/Atom">
6+
7+
<title>Git Ready</title>
8+
<link href="http://gitready.com/atom.xml" rel="self"/>
9+
<link href="http://gitready.com/"/>
10+
<updated>{{ site.time | date_to_xmlschema }}</updated>
11+
<id>http://gitready.com/</id>
12+
<author>
13+
<name>Nick Quaranto</name>
14+
<email>[email protected]</email>
15+
</author>
16+
17+
{% for post in site.posts %}
18+
<entry>
19+
<title>{{ post.title }}</title>
20+
<link href="http://gitready.com{{ post.url }}"/>
21+
<updated>{{ post.date | date_to_xmlschema }}</updated>
22+
<id>http://gitready.com{{ post.id }}</id>
23+
<content type="html">{{ post.content | xml_escape }}</content>
24+
</entry>
25+
{% endfor %}
26+
27+
</feed>

‎css/screen.css

+156-71
Original file line numberDiff line numberDiff line change
@@ -1,107 +1,192 @@
1-
body {
2-
background: #e0e0c0;
3-
font-family: Verdana, Arial, sans-serif;
4-
font-size: 13px;
5-
}
1+
/*****************************************************************************/
2+
/*
3+
/* Common
4+
/*
5+
/*****************************************************************************/
66

7-
#header {
8-
width: 100%;
9-
background: #e0c0a0;
10-
border-bottom: 3px solid #a08060;
11-
text-align: center;
12-
}
7+
/* Global Reset */
138

14-
h1 {
15-
font-family: "Consolas", "Monaco", "Courier New", "Courier", monospace;
16-
font-size: 30px;
17-
padding: 0;
9+
* {
1810
margin: 0;
11+
padding: 0;
1912
}
2013

21-
.footer {
22-
background: #808060;
23-
text-align: center;
24-
color: #000;
25-
position: absolute;
26-
width: 100%;
14+
html, body {
15+
height: 100%;
2716
}
2817

29-
.grid_4 {
18+
body {
19+
background-color: white;
20+
font: 13.34px helvetica, arial, clean, sans-serif;
21+
*font-size: small;
3022
text-align: center;
31-
height: 100%;
3223
}
3324

34-
.articles {
35-
background: #c0c0a0;
36-
border: 2px solid #404040;
25+
h1, h2, h3, h4, h5, h6 {
26+
font-size: 100%;
3727
}
3828

39-
.articles a {
40-
display: block;
41-
font-size: 14px;
42-
padding: 10px;
43-
}
44-
.articles a:hover {
45-
background: #a0a080;
29+
h1 {
30+
margin-bottom: 1em;
4631
}
4732

48-
h2 {
49-
font-family: Consolas, Monaco, "Courier New", Courier, monospace;
50-
font-size: 28px;
51-
padding: 0;
52-
margin-bottom: 5px;
33+
p {
34+
margin: 1em 0;
5335
}
5436

55-
.container_12 {
56-
margin-top: 10px;
37+
a {
38+
color: #00a;
5739
}
5840

59-
#green {
60-
color: #408040;
41+
a:hover {
42+
color: black;
6143
}
6244

63-
#yellow {
64-
color: #BFB130;
45+
a:visited {
46+
color: #a0a;
6547
}
6648

67-
#red {
68-
color: #BF3030;
49+
table {
50+
font-size: inherit;
51+
font: 100%;
6952
}
7053

71-
a {
72-
text-decoration: none;
54+
/*****************************************************************************/
55+
/*
56+
/* Home
57+
/*
58+
/*****************************************************************************/
59+
60+
ul.posts {
61+
list-style-type: none;
62+
margin-bottom: 2em;
7363
}
74-
a:visited {
75-
color: #000;
64+
65+
ul.posts li {
66+
line-height: 1.75em;
7667
}
7768

78-
.footer a {
79-
color: #e0e0e0;
69+
ul.posts span {
70+
color: #aaa;
71+
font-family: Monaco, "Courier New", monospace;
72+
font-size: 80%;
73+
}
74+
75+
/*****************************************************************************/
76+
/*
77+
/* Site
78+
/*
79+
/*****************************************************************************/
80+
81+
.site {
82+
font-size: 110%;
83+
text-align: justify;
84+
width: 40em;
85+
margin: 3em auto 2em auto;
86+
line-height: 1.5em;
8087
}
81-
.footer a:hover {
82-
color: #000;
88+
89+
.title {
90+
color: #a00;
91+
font-weight: bold;
92+
margin-bottom: 2em;
8393
}
8494

85-
/*
95+
.site .title a {
96+
color: #a00;
97+
text-decoration: none;
98+
}
99+
100+
.site .title a:hover {
101+
color: black;
102+
}
86103

87-
Sticky Footer by Ryan Fait
88-
http://ryanfait.com/
104+
.site .title a.extra {
105+
color: #aaa;
106+
text-decoration: none;
107+
margin-left: 1em;
108+
}
109+
110+
.site .title a.extra:hover {
111+
color: black;
112+
}
89113

90-
*/
114+
.site .meta {
115+
color: #aaa;
116+
}
91117

92-
* {
93-
margin: 0;
94-
}
95-
html, body {
96-
height: 100%;
97-
}
98-
.wrapper {
99-
min-height: 100%;
100-
height: auto !important;
101-
height: 100%;
102-
margin: 0 auto -22px; /* the bottom margin is the negative value of the footer's height */
118+
.site .footer {
119+
font-size: 80%;
120+
color: #666;
121+
border-top: 4px solid #eee;
122+
margin-top: 2em;
123+
overflow: hidden;
124+
}
125+
126+
.site .footer .contact {
127+
float: left;
128+
margin-right: 3em;
129+
}
130+
131+
.site .footer .contact a {
132+
color: #8085C1;
133+
}
134+
135+
.site .footer .rss {
136+
margin-top: 1.1em;
137+
margin-right: -.2em;
138+
float: right;
139+
}
140+
141+
.site .footer .rss img {
142+
border: 0;
143+
}
144+
145+
/*****************************************************************************/
146+
/*
147+
/* Posts
148+
/*
149+
/*****************************************************************************/
150+
151+
#post {
152+
103153
}
104-
.footer, .push {
105-
height: 22px; /* .push must be the same height as .footer */
154+
155+
/* standard */
156+
157+
#post pre {
158+
border: 1px solid #ddd;
159+
background-color: #eef;
160+
padding: 0 .4em;
161+
}
162+
163+
#post code {
164+
border: 1px solid #ddd;
165+
background-color: #eef;
166+
font-size: 95%;
167+
padding: 0 .2em;
168+
}
169+
170+
#post pre code {
171+
border: none;
172+
}
173+
174+
/* terminal */
175+
176+
#post pre.terminal {
177+
border: 1px solid black;
178+
background-color: #333;
179+
color: white;
180+
}
181+
182+
#post pre.terminal code {
183+
background-color: #333;
184+
}
185+
186+
#related {
187+
margin-top: 2em;
106188
}
107189

190+
#related h2 {
191+
margin-bottom: 1em;
192+
}

‎index.html

+8-31
Original file line numberDiff line numberDiff line change
@@ -2,35 +2,12 @@
22
layout: default
33
title: Git Ready &raquo; tutorials for the noob to the guru
44
---
5-
<div class="container_12">
6-
<div class="grid_4">
7-
<h2 id="green">beginner</h2>
8-
<div class="articles">
9-
<a>Installation</a>
10-
<a>Crash Course</a>
11-
<a>Why Git?</a>
12-
<a>Version Control Basics</a>
13-
<a>GUI Interfaces</a>
14-
</div>
15-
</div>
16-
<div class="grid_4">
17-
<h2 id="yellow">intermediate</h2>
18-
<div class="articles">
19-
<a>Branching/Merging</a>
20-
<a>Stashing</a>
21-
<a>Cherry Picking</a>
22-
<a>Rebasing</a>
23-
<a>Tagging</a>
24-
<a>Remotes</a>
25-
</div>
26-
</div>
27-
<div class="grid_4">
28-
<h2 id="red">advanced</h2>
29-
<div class="articles">
30-
<a>Submodules</a>
31-
<a>Self-Hosting</a>
32-
<a>Hooks</a>
33-
<a>Other Applications</a>
34-
</div>
35-
</div>
5+
<div id="home">
6+
<h1>Git Tips</h1>
7+
<ul class="posts">
8+
{% for post in site.posts %}
9+
<li><span>{{ post.date | date_to_string }}</span> &raquo; <a href="{{ post.url }}">{{ post.title }}</a></li>
10+
{% endfor %}
11+
</ul>
3612
</div>
13+

0 commit comments

Comments
 (0)