From: Evan Prodromou <evan@status.net>
Date: Thu, 28 Jan 2010 03:05:32 +0000 (-0500)
Subject: Merge branch 'testing'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=5e1a9ad04d4e10ee44881a26ea72c9a80f748188;p=quix0rs-gnu-social.git

Merge branch 'testing'

Conflicts:
	theme/base/css/display.css
---

5e1a9ad04d4e10ee44881a26ea72c9a80f748188
diff --cc theme/base/css/display.css
index 7eff4709c7,65dd159900..fb74b1d0b0
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@@ -984,12 -1039,13 +1039,17 @@@ overflow:visible
  #showstream .notice div.entry-content {
  margin-left:0;
  }
 +#shownotice .notice .entry-title,
 +#shownotice .notice div.entry-content {
 +margin-left:110px;
 +}
  #shownotice .notice .entry-title {
+ margin-left:110px;
  font-size:2.2em;
+ min-height:123px;
+ }
+ #shownotice .notice div.entry-content {
+ margin-left:0;
  }
  
  .notice p.entry-content {