Matthew Taylor ccd048893f Merge branch 'develop' into feature/email-confirmation-banner ... * develop: Fix GH-168: Rehabilitate the `Modal` props.style Fix GH-162: Show "user deletion canceled" modal Set empty states on sign out Clean up activity item rendering logic Add some padding to the empty message Make sure boxes aren't transparent Add empty state for What's Happening box Fix GH-124: Fix studio thumbnail URLs Only show "Welcome" panel if user is < 2 weeks old Fix #152: Don't output activity without a message Fix #102: Add remix and love icons Update arrow icons on Carousels # Conflicts: # src/components/modal/modal.jsx # src/views/splash/splash.jsx		2015-10-25 09:05:35 -04:00
..
featured.json	Fix thumbnail URL per discussion	2015-10-06 13:07:24 -04:00
splash.jsx	Merge branch 'develop' into feature/email-confirmation-banner	2015-10-25 09:05:35 -04:00
splash.scss	Add welcome component and show it conditionally	2015-10-22 12:21:47 -04:00