From: Evan Prodromou <evan@controlyourself.ca>
Date: Wed, 15 Apr 2009 15:35:43 +0000 (-0400)
Subject: Merge branch '0.7.x' into 0.8.x
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=55d7bb4701ca39fb8f4b859b19defdfc7af0142c;p=quix0rs-gnu-social.git

Merge branch '0.7.x' into 0.8.x
---

55d7bb4701ca39fb8f4b859b19defdfc7af0142c
diff --cc theme/default/css/display.css
index 2f41a9843c,69a600cc28..0c8fae166f
--- a/theme/default/css/display.css
+++ b/theme/default/css/display.css
@@@ -183,11 -178,9 +178,9 @@@ background-image:url(../../base/images/
  }
  .form_user_block input.submit,
  .form_user_unblock input.submit {
 -background-image:url(../images/icons/twotone/green/shield.gif);
 +background-image:url(../../base/images/icons/twotone/green/shield.gif);
  }
  
- 
- 
  /* NOTICES */
  .notices li.over {
  background-color:#fcfcfc;
@@@ -230,9 -223,8 +223,8 @@@ background-color:#fcfcfc
  }
  /*END: NOTICES */
  
- 
  #new_group a {
 -background:transparent url(../images/icons/twotone/green/news.gif) no-repeat 0 45%;
 +background:transparent url(../../base/images/icons/twotone/green/news.gif) no-repeat 0 45%;
  }
  
  .pagination .nav_prev a,
diff --cc theme/identica/css/display.css
index a961188979,d05578d439..cc19da0f70
--- a/theme/identica/css/display.css
+++ b/theme/identica/css/display.css
@@@ -183,11 -178,9 +178,9 @@@ background-image:url(../../base/images/
  }
  .form_user_block input.submit,
  .form_user_unblock input.submit {
 -background-image:url(../images/icons/twotone/green/shield.gif);
 +background-image:url(../../base/images/icons/twotone/green/shield.gif);
  }
  
- 
- 
  /* NOTICES */
  .notices li.over {
  background-color:#fcfcfc;
@@@ -230,9 -223,8 +223,8 @@@ background-color:#fcfcfc
  }
  /*END: NOTICES */
  
- 
  #new_group a {
 -background:transparent url(../images/icons/twotone/green/news.gif) no-repeat 0 45%;
 +background:transparent url(../../base/images/icons/twotone/green/news.gif) no-repeat 0 45%;
  }
  
  .pagination .nav_prev a,