From 04c631fd24d27e0543ce7b61c2f91e97b5225a02 Mon Sep 17 00:00:00 2001
From: Waseem Daher <wdaher@humbughq.com>
Date: Thu, 11 Oct 2012 15:54:57 -0400
Subject: [PATCH] Don't let timestamp float over other content.

Before this commit, the timestamps are higher than the narrowbar,
on the z-axis, so they slide over it as you scroll.

As a philosophical aside, I almost wonder if the timestamps should
live in their own table row, that way they can't possibly overlap
with the message bodies. (This would require reverting Tim-style
sometimes-show-date-and-time timestamps.)

(imported from commit 0c59f1feacebd59b88e76bf056d96e05159d2937)
---
 zephyr/static/styles/zephyr.css | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/zephyr/static/styles/zephyr.css b/zephyr/static/styles/zephyr.css
index bbdb892c5a..17cc0635cf 100644
--- a/zephyr/static/styles/zephyr.css
+++ b/zephyr/static/styles/zephyr.css
@@ -138,8 +138,6 @@ td.pointer {
 .message_time {
     color: gray;
     float: right;
-    position: relative;
-    right: -25px;
     font-size: 90%;
 }
 
@@ -162,6 +160,7 @@ table.focused_table {
 
 .message_content {
     margin-left: 5px;
+    margin-right: 35px; /* size of the timestamp */
 }
 
 blockquote {
@@ -174,7 +173,7 @@ blockquote p {
 }
 
 .messagebox {
-    padding: 5px 35px 5px 14px;
+    padding: 5px 14px;
     background-color: white;
     border: 1px solid gray;
     border-width: 0px 1px 1px 1px;