nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
diaspora/public/stylesheets/sass
History
danielgrippi 60a60733df Merge branch 'master' into follow 
Conflicts:
	app/controllers/aspects_controller.rb
	app/controllers/contacts_controller.rb
	app/controllers/people_controller.rb
	app/controllers/photos_controller.rb
	app/controllers/tags_controller.rb
	app/helpers/notifications_helper.rb
	app/models/notifications/new_request.rb
	app/models/user_preference.rb
	public/javascripts/view.js
	spec/controllers/aspects_controller_spec.rb
	spec/controllers/contacts_controller_spec.rb
	spec/controllers/home_controller_spec.rb
	spec/controllers/post_visibilities_controller_spec.rb
	spec/controllers/requests_controller_spec.rb
	spec/mailers/notifier_spec.rb
	spec/models/user_spec.rb
2011-05-12 15:49:51 -07:00
..
_mixins.scss prevent user from hitting aspectmemberships controller before response on dropdowns 2011-05-11 17:07:58 -07:00
application.sass Merge branch 'master' into follow 2011-05-12 15:49:51 -07:00
autocomplete.sass add shadow/transparency to autocompletion. removed a hide()/show() from publisher hide and show functions. 2011-02-10 11:09:14 -08:00
mobile.sass Merge remote branch 'ritchewilson/prev_next' 2011-04-19 17:05:12 -07:00
rtl.sass moved comments textarea to left so it wont disappear avatar in RTL UI 2011-04-12 00:12:39 +04:30
sessions.sass You can now add contacts from tags#show. Also, a CSS change to help us start refactoring: there's now a class to the body that you can set with content_for :body_class. This lets you scope CSS to a particular page. Started breaking out smaller CSS files. 2011-03-19 20:53:55 -07:00
tags.sass "Add contact" buttons on tag page are smaller and don't appear on top of names. 2011-03-22 13:16:58 -07:00
ui.sass broke out dropdown into its own partial. aspect dropdown on person show. user menu fixed 2011-05-11 18:33:17 -07:00