# Use "patch -p0 < lush-nathan.patch"

# From CHANGELOG 0.99.6: "Fixed the dropping sidebar in IE when italic text is present"
diff -Naur lush/_css/msie.css patched/_css/msie.css
--- lush/_css/msie.css	2006-03-19 04:43:09.000000000 -0700
+++ patched/_css/msie.css	2006-03-23 20:45:58.000000000 -0700
@@ -18,4 +18,7 @@
   filter:progid:DXImageTransform.Microsoft.Alpha(opacity=100);	
 } 
 
-
+.postcontent {
+  width: 481px;
+  overflow:visible;
+}

# Add 12x12 RSS icon "_img/rss12.gif"
diff -Naur lush/_img/rss12.gif patched/_img/rss12.gif
--- lush/_img/rss12.gif	1969-12-31 17:00:00.000000000 -0700
+++ patched/_img/rss12.gif	2006-03-25 18:30:32.000000000 -0700
@@ -0,0 +1,2 @@
+GIF89aæTô“=ýñæã€>î†:î‡:ö›Dëƒ9éŽBê�Bài,è{7ë~2ë€9ñŒ<çv0ò�<åv6ð‹;î…3õ–>ão.ñŠ4à{=ãr5ó�6õ•;ñ±ŠüÀƒù«]úåØ÷²uíšc÷™?ú¸vôœOú½ƒû£FþçÎås.û¿ƒû¯_øÄšã€Sì‡>ùÇšô¼˜ýêÙó¤fßj0ù±jþóæî¦}ûºwán4ú·vó¶‹ô’=û®^ýïåð�eö«hë€1ø¹�þøòèy0é~7øÅšñ•MÛ^*ñ�9æz3ð�@Ýc+ýðæ÷—8ï†4ö”7þòæø˜8ú›9óŽ6û�:ÿùóÿÿÿÿÿÿ!ùT,@Ž€TATNRS#>S;-S	)<L!RRPKF@SSI,NOQJ8'2S6S7
+¯£	HD&+L­Q=/B.SM9¿
¨M4(RGL1$MK: O%?"CS3S*0TŠ4À@„5,P	;
\ No newline at end of file

# From CHANGELOG 0.99.7: "Gravitar did not show up because of wrong url"
diff -Naur lush/comments.php patched/comments.php
--- lush/comments.php	2006-03-19 04:43:09.000000000 -0700
+++ patched/comments.php	2006-03-23 20:46:45.000000000 -0700
@@ -42,7 +42,7 @@
 	  <div class="commenthead"><em><?php echo $commentcount; ?>.</em>&nbsp;<?php if (function_exists('time_since')) { ?> <?php printf( __('%s ago','lush'), time_since(abs(strtotime($comment->comment_date_gmt . " GMT")), time())) ?> <? } else { comment_time(__('F jS, Y H:i','lush')); } ?></div>
 	  <div class="commenttext">
 <?php if(function_exists(gravatar)) { ?>
-		<img alt="Avatar" class="gravatar" src="<?php gravatar("R", 40, "bloginfo('stylesheet_directory')/_img/default_gravatar.png"); ?>" />
+	<img alt="Avatar" class="gravatar" src="<?php gravatar("R", 40, get_bloginfo('stylesheet_directory')."/_img/default_gravatar.png"); ?>" />
 <?php } ?>
 		<?php comment_text() ?>
 		<br style="clear: both;" />

# Remove extraneous lines from functions.php, which caused my host to
# complain of headers already being sent.
diff -Naur lush/functions.php patched/functions.php
--- lush/functions.php	2006-03-19 06:42:56.000000000 -0700
+++ patched/functions.php	2006-03-24 13:15:52.000000000 -0700
@@ -260,5 +260,3 @@
 	$result = $wpdb->query($burninate);
 	}
 } ?>
-
-

# (1) From CHANGELOG: "Fixes the link in the hot header"
# (2) Add WordPress calendar via get_calendar()
diff -Naur lush/header.php patched/header.php
--- lush/header.php	2006-03-19 06:28:45.000000000 -0700
+++ patched/header.php	2006-03-23 20:45:13.000000000 -0700
@@ -50,7 +50,7 @@
     <div id="content">
       <div id="head">
 <?php if(get_option(lushheaderlink) == '1') { ?>
-		<div id="hotheader" onclick="location.href='<?php bloginfo('home'); ?>';" style="cursor:pointer;"></div>
+		<div id="hotheader" onclick="location.href='<?php bloginfo('url'); ?>';" style="cursor:pointer;"></div>
 		<div id="ladybug" onclick="new Effect.ScrollTo('naughty');" style="top:26px;">&nbsp;</div>
 <?php } else { ?>
         <h1 id="sitename"><a href="<?php echo get_settings('home'); ?>/"><?php bloginfo('name'); ?></a></h1><br />
diff -Naur lush/sidebar.php patched/sidebar.php
--- lush/sidebar.php	2006-03-19 04:43:09.000000000 -0700
+++ patched/sidebar.php	2006-03-25 18:31:06.000000000 -0700
@@ -96,8 +96,8 @@
         <h3><?php _e('Syndicate','lush'); ?></h3>
 
 		<ul>
-		  <li><a href="<?php bloginfo('rss_url'); ?>" title="<?php _e('Articles feed','lush'); ?>"><?php _e('Articles','lush'); ?></a></li>
-		  <li><a href="<?php bloginfo('comments_rss2_url'); ?>" title="<?php _e('Comments feed','lush'); ?>"><?php _e('Comments','lush'); ?></a></li>
+	<li><a href="<?php bloginfo('rss_url'); ?>" title="<?php _e('Articles feed','lush'); ?>"><?php _e('Articles','lush'); ?> <img src="<?php bloginfo('stylesheet_directory'); ?>/_img/rss12.gif" width="12" height="12" border="0" alt="(rss)" align="bottom"/></a></li>
+		  <li><a href="<?php bloginfo('comments_rss2_url'); ?>" title="<?php _e('Comments feed','lush'); ?>"><?php _e('Comments','lush'); ?> <img src="<?php bloginfo('stylesheet_directory'); ?>/_img/rss12.gif" width="12" height="12" border="0" alt="(rss)" align="bottom"/></a></li>
 		</ul>
       </div>
 
@@ -110,6 +110,15 @@
 			<?php wp_meta(); ?>
 		</ul>
 	  </div>
+
+	  <div class="sidebar-node">
+		<h3><?php _e('Calendar','lush'); ?></h3>
+
+		<ul>
+			<li><?php get_calendar(); ?></li>
+			<?php wp_meta(); ?>
+		</ul>
+	  </div>
 			
     
  

# This was causing a duplicate header on my install. I patched (er,
# /hacked/). Works for me, but I haven't dared touch XHTML validation...
diff -Naur lush/single.php patched/single.php
--- lush/single.php	2006-03-19 04:53:21.000000000 -0700
+++ patched/single.php	2006-03-24 08:17:14.000000000 -0700
@@ -1,15 +1,5 @@
 <?php get_header(); ?>
 
-  <div id="container">
-    <div id="content">
-      <div id="head">
-        <h1 id="sitename"><a href="<?php echo get_settings('home'); ?>/"><?php bloginfo('name'); ?></a></h1><br />
-        <h3 id="subtitle"><?php bloginfo('description'); ?></h3><br />
-		
-		<a id="ffplug" title="Get Firefox" href="http://www.getfirefox.com/"></a>
-	    
-		<div id="ladybug" onclick="new Effect.ScrollTo('naughty');">&nbsp;</div>
-      </div>
  
 <?php if (have_posts()) : ?>
 		

# Remove the <img> background, border, and padding, turn the ladybugs off,
# and add some style to fix the calendar link display.
diff -Naur lush/style.css patched/style.css
--- lush/style.css	2006-03-19 06:40:19.000000000 -0700
+++ patched/style.css	2006-03-25 18:03:31.000000000 -0700
@@ -638,14 +638,14 @@
 }
 
 .post p, #viewpage p {
-  clear: both;
+/*  clear: both; */
 }
+
 .post img, #viewpage img {
-  background: #fff;
-  border: 1px solid #ccc;
-  padding: 7px;
+  border: 0px
 }
 
+
 .postmetadata {
   margin-left: 38px;
 }
@@ -1067,7 +1067,7 @@
 }
 
 #ladybug  {
-
+  display: none;
   background:url(./_img/lbtop.gif);
   position:relative;
   top: 76px;
@@ -1080,7 +1080,7 @@
 }
 
 #naughty  {
-  display:block;
+  display:none;
   position:relative;
   float:left;
   right:13px;
@@ -1130,8 +1130,33 @@
 text-align: right;
 }
 
+#wp-calendar a
+/* To override .sidebar-note li a */
+{
+  color: white;
+  font-weight: bold;
+  text-decoration: underline;
+  display: inline;
+  width: auto;
+  background-image: none;
+  padding: 0px;
+  line-height: auto;
+}
 
+#wp-calendar #today
+{
+  border: solid 1px red;
+}
 
+#table wp-calendar
+{
+  text-align: center;
+  width: auto;
+  margin-left: auto;
+  margin-right: auto;
+}
 
-
-
+#wp-calendar th, #wp-calendar td
+{
+  text-align: right;
+}
