Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Thomas Willingham 2013-03-23 21:19:54 +00:00
commit 43af9b1429

View File

@ -1090,8 +1090,7 @@ footer {
}
.wall-item-content img {
max-height: 95% !important;
max-width: 95% !important;
max-width: 95% !important;
/* box-shadow: 8px 8px 8px #666; can't really have this because of smileys */
}
@ -3754,4 +3753,4 @@ ul.menu-popup {
.profile-match-connect { margin-top: 5px; }
.reshared-content { margin-left: 30px; }
.shared_header img { margin-right: 10px; }
.shared_header img { margin-right: 10px; }