Merge commit 'origin/master'

This commit is contained in:
Dan Davison 2009-09-06 18:37:48 -04:00
commit 0ad03e87b8
4 changed files with 15 additions and 12 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 113 KiB

After

Width:  |  Height:  |  Size: 258 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.0 KiB

After

Width:  |  Height:  |  Size: 2.0 KiB

View File

@ -16,15 +16,19 @@
</div>
<div id="logo">
<p>
<img src="images/Brueghel-little-tower-of-babel.png"
alt="images/Brueghel-little-tower-of-babel.png"
title="And the Lord said, Behold, the people is one, and they
have all one language; and this they begin to do; and now
nothing will be restrained from them, which they have
imagined to do. Genesis 11:1-9"/>
<img src="images/tower-of-babel.png" alt="images/tower-of-babel.png"/>
<div id="attr">
The Tower of Babel by Pieter Bruegel the Elder
by
<a href="http://commons.wikimedia.org/wiki/Pieter_Brueghel_the_Elder" title="">
<b>Pieter Brueghel the Elder</b>
</a>
</div>
<p>
And the Lord said, Behold, the people is one, and they have all
one language; and this they begin to do; and now nothing will be
restrained from them, which they have imagined to do. Genesis
11:1-9
</p>
</p>
</div>
#+end_html

View File

@ -36,12 +36,11 @@ the Org-babel documentation.
#+begin_src sass :file doc/stylesheet.css :results silent
#logo
float: right
#attr
font-size: 8pt
float: center
text-align: center
margin-top: -1em
max-width: 240px
font-size: 8pt
#attr
margin: -0.5em
#subtitle
float: center