]> git.quilime.com - plog.git/commitdiff
git.quilime.com / plog.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 1424c54)
Errant commit data and style changes
authorGabriel Dunne <gdunne@quilime.com>
Wed, 29 Sep 2010 22:34:33 +0000 (15:34 -0700)
committerGabriel Dunne <gdunne@quilime.com>
Wed, 29 Sep 2010 22:34:33 +0000 (15:34 -0700)
templates/single.html.tpl patch | blob | history
www/css/style.css patch | blob | history

diff --git a/templates/single.html.tpl b/templates/single.html.tpl
index 88e1713cda81aa1bdfd470342b50ad749f853ab5..91a416ff850592211133e44eb87112af0eaa5573 100644 (file)
--- a/templates/single.html.tpl
+++ b/templates/single.html.tpl
@@ -3,11 +3,7 @@
     
     <? $this->include_template('head-inc.html.tpl') ?>
     
-<<<<<<< HEAD
-    <title><?=SITE_TITLE?>: <?=$data['title'];?></title>
-=======
     <title><?=SITE_TITLE?><?=TITLE_DELIMITER?> <?=$data['title'];?></title>
->>>>>>> master
     
 </head>
 <body>
diff --git a/www/css/style.css b/www/css/style.css
index 5f5e2c1a2593be442ba3e0cd143f96939a45ba85..ca8472efe64797a5bd42fd15042a760d647b4f56 100644 (file)
--- 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;}
Unnamed repository; edit this file 'description' to name the repository.