nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
diaspora/app/assets/images
History
Juan Manuel Azambuja 1115e10536 Merge branch 'develop' into diaspora_with_sprites 
Conflicts:
	Gemfile
	Gemfile.lock
	app/assets/stylesheets/application.css.sass
	app/assets/templates/comment_tpl.jst.hbs
	app/assets/templates/stream-element_tpl.jst.hbs
	app/helpers/aspects_helper.rb
	app/helpers/contacts_helper.rb
	app/views/aspects/_aspect_listings.haml
	app/views/aspects/toggle_contact_visibility.js.erb
	app/views/contacts/_aspect_listings.haml
	app/views/layouts/_header.html.haml
	app/views/shared/_footer.html.haml
	app/views/tags/_followed_tags_listings.haml
2013-03-11 20:10:55 -03:00
..
branding Merge branch 'develop' into diaspora_with_sprites 2013-03-11 20:10:55 -03:00
buttons fixed some styling during the framing process [ci skip] 2012-05-23 18:47:01 -07:00
facebox
fonts DG RY; mostly done, validations pending [ci skip] 2012-05-04 17:38:07 -07:00
icons Merge branch 'develop' into diaspora_with_sprites 2013-03-11 20:10:55 -03:00
img don't expose follow/unfollow to a user in the UI 2012-04-28 11:07:18 -07:00
landing update landing page 2012-08-24 13:45:05 -07:00
mocks
services
social_media_logos
texture added texture directory to assets/images [ci skip] 2012-05-23 17:28:02 -07:00
user
add_contact_button.png
ajax-loader.gif
ajax-loader2.gif
ajax-loader_inverted.gif
apple-touch-icon.png add two more images to the assets 2012-04-04 13:12:07 -07:00
arrow-left.png
arrow-right.png
asterisk.png
asterisk_white.png
close_label.png
deletelabel.png Resize deletelabel and ignoreuser images to align them 2012-12-02 13:20:24 +01:00
down-tick-inset.png
favicon.ico made favicon sexier; extracted form-block into its own custom class; made the title of pages less caps-lock. 2012-05-04 21:25:50 -07:00
favicon.png made favicon sexier; extracted form-block into its own custom class; made the title of pages less caps-lock. 2012-05-04 21:25:50 -07:00
header-bg-long.jpg
header-bg.png
invalid_fat@2x.png validations and all that jazz [ci skip] 2012-05-04 17:38:08 -07:00
mobile-spinner.gif
pen_white.png
sadcat.jpg Update cat image so it's secure - new image from khanb1 on flickr. 2012-12-02 10:31:45 +00:00
signupimages@2x_mini.jpg DG RY; mostly done, validations pending [ci skip] 2012-05-04 17:38:07 -07:00
static-loader.png remove leftover edges from spinner, remove red bg color (fixes #3338) [ci skip] 2012-06-18 23:40:55 +02:00
tipsy.gif
up-tick-inset.png