From: Gabriel Dunne Date: Wed, 29 Sep 2010 22:34:33 +0000 (-0700) Subject: Errant commit data and style changes X-Git-Url: https://git.quilime.com/?a=commitdiff_plain;h=85d3f5a4959b34ca31bf13b455185da6b5be34ec;p=plog.git Errant commit data and style changes --- diff --git a/templates/single.html.tpl b/templates/single.html.tpl index 88e1713..91a416f 100644 --- a/templates/single.html.tpl +++ b/templates/single.html.tpl @@ -3,11 +3,7 @@ include_template('head-inc.html.tpl') ?> -<<<<<<< HEAD - <?=SITE_TITLE?>: <?=$data['title'];?> -======= <?=SITE_TITLE?><?=TITLE_DELIMITER?> <?=$data['title'];?> ->>>>>>> master diff --git a/www/css/style.css b/www/css/style.css index 5f5e2c1..ca8472e 100644 --- a/www/css/style.css +++ b/www/css/style.css @@ -30,7 +30,7 @@ blockquote { margin:0; padding:2em 4em; max-width:600px; } -.nav { position:absolute; z-index:1; top:5px; left:30px; } +.nav { position:absolute; z-index:1; top:10px; left:30px; } .nav ul { margin-left:1em; } .nav a { text-decoration:none; font-weight:bold; } .nav li { display:inline-block; margin-right:2em;}