]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch '0.7.x' into 0.8.x
authorEvan Prodromou <evan@controlyourself.ca>
Wed, 15 Apr 2009 15:35:43 +0000 (11:35 -0400)
committerEvan Prodromou <evan@controlyourself.ca>
Wed, 15 Apr 2009 15:35:43 +0000 (11:35 -0400)
1  2 
lib/action.php
theme/default/css/display.css
theme/identica/css/display.css

diff --cc lib/action.php
Simple merge
index 2f41a9843c836ccdf9185b69f7f74094e05e49e5,69a600cc286303440516d5038f8c59c6df5dd0ee..0c8fae166ff14895d72f022056ddff3bdd92eb6a
@@@ -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,
index a961188979074bec764bb9747961610398942294,d05578d4395c1794affa3030d44c07f3ffbe8e54..cc19da0f708ecab64658599e1e93c5047ce6def3
@@@ -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,