Skip to content

Commit

Permalink
uaktualnienie do html5
Browse files Browse the repository at this point in the history
  • Loading branch information
Wlodek Bzyl committed Feb 28, 2013
1 parent 23302a5 commit f21922f
Show file tree
Hide file tree
Showing 25 changed files with 112 additions and 601 deletions.
14 changes: 5 additions & 9 deletions README.markdown → README.md
@@ -1,10 +1,9 @@
# Szablon jekyll-bloga

Dostosowany do konfiguracji serwera *Sigma* szablon bloga.
Statyczne strony bloga generujemy za pomocą programu *jekyll*.


## Instalacja
## Instalacja szablonu

Klikamy w ikonkę **fork** i natępnie klonujemy sforkowanego bloga
na swoje konto na serwerze *Sigma*. Klona umieszczamy w katalogu
Expand All @@ -14,23 +13,20 @@ Cała procedura może wyglądać tak:

<pre>mkdir -p ~/public_git/
cd ~/public_git/
git clone git@github.com:⟨twój login na <b>githubie</b>⟩/jblog.git sp
git clone git@github.com:⟨twój login na <b>githubie</b>⟩/jblog.git blog
</pre>

gdzie nazwa katalogu *sp* to skrót (modulo polskie literki)
od nazwy wykładu „Środowisko programisty”.


## Jak zacząć?

Wpisy do bloga umieszczamy w katalogu `_posts`.
Nazwy plików z postami tworzymy według schematu:

rok-miesiąc-dzień-tytuł.markdown
rok-miesiąc-dzień-tytuł.md

na przykład:

2009-06-12-jekyll-howto.markdown
2009-06-12-jekyll-howto.md

Po napisaniu posta generujemy statyczną wersję bloga wykonując z
katalogu z blogiem, czyli z katalogu **~/public_git/sp/** polecenie:
Expand Down Expand Up @@ -158,7 +154,7 @@ na którą będziemy pobierać nowe wersje **v2** z repozytorium technomancy.
W tym celu tworzymy tzw. *tracking branch*:

git checkout --track technomancy/v2
git checkout -b v2.x --track technomancy/v2 # lub tak, zmieniamy nazwę gałęzi na v2.x
git checkout -b v2.x --track technomancy/v2 # lub tak, zmieniamy nazwę gałęzi na v2.x

Teraz polecenie:

Expand Down
46 changes: 12 additions & 34 deletions _layouts/default.html
@@ -1,36 +1,14 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="pl" lang="pl-pl">
<head>
<meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>{{ page.title }}</title>
<meta name="author" content="Imię Nazwisko" />
<link href="http://sigma.inf.ug.edu.pl/~login_na_sigmie/atom.xml" rel="alternate"
title="Imię Nazwisko" type="application/atom+xml" />

<link rel="stylesheet" href="../../../../css/syntax.css" type="text/css" />
<link rel="stylesheet" href="../../../../css/screen.css" type="text/css" media="screen, projection" />
<link rel="stylesheet" href="../../../../css/blog.css" type="text/css" media="screen, projection" />
</head>
<body>

<div class="site span-21"><!-- showgrid -->

<div class="span-21" id="header">
<div id="logo" class="push-1 span-7">
<a href="/~login_na_sigmie/blog">MÓJ@BLOG</a>
<!doctype html public "♥★♥★">
<html "lang=pl">
<head>
<meta charset="utf-8">
<title>{{ page.title }}</title>
<link rel="stylesheet" href="/css/blog.css">
<link rel="stylesheet" href="/css/pygments.css">
</head>
<body>
<div class="content">
{{ content }}
</div>
<div class="span-13 last">
<div class="append-7" id="links">
<a href="/~login_na_sigmie">home</a>
</div>
</div>
</div>

{{ content }}

</div>

</body>
</body>
</html>
46 changes: 12 additions & 34 deletions _layouts/index.html
@@ -1,36 +1,14 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="pl" lang="pl-pl">
<head>
<meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>{{ page.title }}</title>
<meta name="author" content="Imię Nazwisko" />
<link href="http://sigma.inf.ug.edu.pl/~login_na_sigmie/blog/atom.xml" rel="alternate"
title="Imię Nazwisko" type="application/atom+xml" />

<link rel="stylesheet" href="css/syntax.css" type="text/css" />
<link rel="stylesheet" href="css/screen.css" type="text/css" media="screen, projection" />
<link rel="stylesheet" href="css/blog.css" type="text/css" media="screen, projection" />
</head>
<body>

<div class="site span-21"><!-- showgrid -->

<div class="span-21" id="header">
<div id="logo" class="push-1 span-7">
<a href="/~login_na_sigmie/blog">MÓJ@BLOG</a>
<!doctype html public "♥★♥★">
<html "lang=pl">
<head>
<meta charset="utf-8">
<title>{{ page.title }}</title>
<link rel="stylesheet" href="/css/blog.css">
<link rel="stylesheet" href="/css/pygments.css">
</head>
<body>
<div class="content">
{{ content }}
</div>
<div class="span-13 last">
<div class="append-7" id="links">
<a href="/~login_na_sigmie">home</a>
</div>
</div>
</div>

{{ content }}

</div>

</body>
</body>
</html>
6 changes: 3 additions & 3 deletions _layouts/post.html
@@ -1,6 +1,6 @@
---
layout: default
---
<div id="post" class="prepend-1 span-13">
{{ content }}
</div>
<article>
{{ content }}
</article>
Expand Up @@ -4,7 +4,7 @@ title: Jekyll-Blog HOWTO
---

<blockquote>
<img src="../../../../images/alan-perlis.gif" alt="[Alan Perlis]" />
<img src="/images/alan-perlis.png" alt="[Alan Perlis]" />
<p>
Dealing with failure is easy: Work hard to improve. Success is also
easy to handle: You've solved the wrong problem. Work hard to improve.
Expand All @@ -18,7 +18,7 @@ title: Jekyll-Blog HOWTO
## Markdown

Posty wpisujemy używając notacji Markdown.
Notacja jest opisana przez autora Johna Grubera
Notacja jest opisana przez autora Johna Grubera
w witrynie [Daring Fireball](http://daringfireball.net/projects/markdown/syntax).

Na stronie [Markdownr] [] można wpisywać tekst w notacji Markdown
Expand Down
27 changes: 0 additions & 27 deletions atom.xml

This file was deleted.

163 changes: 0 additions & 163 deletions css/blog.css
@@ -1,163 +0,0 @@
/* http://www.colourlovers.com/palette/845780/No_idea */

@font-face {
font-family: Cyklop;
src: url(Cyklop-Italic.eot);
src: local('☺'),
url(Cyklop-Italic.otf) format("opentype");
}

/* text logo */

#header {
margin: 18px 0 0;
}

#links a {
text-decoration: none;
font: 100%/1 "Cyklop", "DejaVu Sans", sans-serif;
font-style: italic;
float: right;
margin-top: 6px;
color: #5A0405;
}

#logo {
font: 256%/1 "Cyklop", "DejaVu Sans", sans-serif;
font-style: italic;
margin-bottom: 24px;
}

#logo a {
text-decoration: none;
color: #5A0405;
}

#logo a:focus, #logo a:hover, #links a:focus, #links a:hover {
color: #321494;
}

html {
/* http://www.hicksdesign.co.uk/journal/forcing-scrollbars-now-even-better */
height: 100%;
margin-bottom: 1px;
background-color: #FEFEEB;
margin: 0 auto 0 44px;
}

.site {
background-color: white;
}

.title {
position: relative;
padding: 18px 0 0 0;
background-color: #FEFEEB;
}

.title a {
position: absolute;
text-decoration: none;
font-size: 100%;
font-weight: bold;
font-style: italic;
color: #FF2C2B;
top: 28px;
right: 0;
}

#home, #post {
padding-top: 22px;
border: solid #888;
border-width: 1px 0 1px 1px;
}

#home h1 {
font-size: 140%;
font-style: italic;
}

#post h1 {
font-size: 180%;
font-style: italic;
font-weight: bold;
margin-bottom: 22px;
color: #FF2C2B;
}

#post h2, #post h3, #home h1 {
color: #489690;
}

#home ul li {
list-style: none;
}

a[href^="http:"], a[href^="mailto:"], a[href^="http:"]:visited,
a[href$=".pdf"], a[href$=".doc"], a[href$=".xls"], a[href$=".rss"],
a[href$=".rdf"], a[href^="aim:"] {
padding:2px 16px 2px 0;
}

blockquote {
font-size: 90%;
font-family: "DejaVu Sans", sans-serif;
font-style: normal;
width: 253px;
margin-top: 6px;
margin-left: 572px;
padding: 18px 22px 0 22px;
position: absolute;
background: #F2F1D6;
-moz-border-radius: 4px;
color: #800;
}

blockquote img {
margin: 0 auto 12px auto;
display: block;
}

blockquote p.author {
margin-top: -1em;
padding-right: 44px;
color: #800;
font-style: italic;
text-align: right;
}

h2 {
font-size: 140%;
padding-bottom: 2px;
border-bottom: 2px dotted #489690;
}

h2, h3 {
color: #489690;
}

code {
margin: 0 2px;
padding: 0.06em 0.125em;
border: 1px solid #403B33;
}

pre code {
border: none;
}

pre {
border-left: 9px solid #FD9945;
margin-left: -49px;
padding: 0 0 0 49px;
}

/* tabele */

caption {
text-align: right;
}

li ul {
margin-bottom: 1.5em;
}
Binary file removed css/fonts/Cyklop-Italic.eot
Binary file not shown.
Binary file removed css/fonts/Cyklop-Italic.otf
Binary file not shown.
Binary file removed css/icons/doc.png
Binary file not shown.
Binary file removed css/icons/email.png
Binary file not shown.
Binary file removed css/icons/external.png
Binary file not shown.
Binary file removed css/icons/feed.png
Binary file not shown.
Binary file removed css/icons/im.png
Binary file not shown.
Binary file removed css/icons/pdf.png
Binary file not shown.
Binary file removed css/icons/visited.png
Binary file not shown.
Binary file removed css/icons/xls.png
Binary file not shown.

0 comments on commit f21922f

Please sign in to comment.