From: Lucian Mogosanu <lucian.mogosanu@gmail.com>
Date: Wed, 1 Jan 2014 22:04:48 +0000 (+0200)
Subject: Merge branch 'testing'
X-Git-Tag: v0.3~4
X-Git-Url: https://git.mogosanu.ro/?a=commitdiff_plain;h=ead6a675597aca8ad6e04a6e5741bb4c3a0b4eaa;p=thetarpit.git

Merge branch 'testing'

Conflicts:
	css/default.css
---

ead6a675597aca8ad6e04a6e5741bb4c3a0b4eaa
diff --cc css/default.css
index 6ac67db,280e51e..7309249
--- a/css/default.css
+++ b/css/default.css
@@@ -35,7 -35,7 +35,7 @@@ a:hover 
  }
  
  p, ul, ol {
--	line-height: 1.6;
++	line-height: 1.68;
  }
  
  pre {
@@@ -140,14 -144,14 +144,14 @@@ span.imgleft 
  	display: inline-block;
  	float: left;
  	margin-right: 10px;
--	margin-top: 5px;
++	margin-top: 9px;
  }
  
  span.imgright {
  	display: inline-block;
  	float: right;
  	margin-left: 10px;
--	margin-top: 5px;
++	margin-top: 11px;
  }
  
  img.thumb {