Commit graph

10 commits

Author SHA1 Message Date
Chocobozzz
1aff0d8c2c Add header logo when hoovered (white logo) 2014-10-18 22:24:05 +02:00
goobertron
19c9c0f394 new version of white2x 2014-01-19 14:53:52 +00:00
goobertron
2fb5098be2 Submitted new images with blurred edges 2014-01-19 14:42:34 +00:00
goobertron
97b5c723af Updated image branding and files with refs to them 2014-01-18 13:03:59 +00:00
Steffen van Bergerem
21ef1c8e41 Remove alpha branding 2013-06-12 23:08:13 +02:00
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
Juan Manuel Azambuja
8747e6601d [Sprites] add sprites for branding 2013-03-11 19:26:57 -03:00
Sean Tilley
e2a2767a74 remove alpha from branding 2012-10-19 13:47:27 -05:00
Maxwell Salzberg
f24b1f1550 remove a bunch of unused assets [ci skip] 2012-05-17 15:14:51 -07:00
Sean Tilley
19bf699b9f Move branding assets to /images/branding for asset pipeline, update template files to point to new branding directory 2012-03-29 17:18:27 -05:00