danielgrippi
|
7eaca0346c
|
Merge branch 'master' into follow
Conflicts:
config/assets.yml
public/stylesheets/sass/_mixins.scss
spec/models/user/posting_spec.rb
|
2011-05-16 14:56:28 -07:00 |
|
danielgrippi
|
0e72a91d1b
|
update login page
|
2011-05-13 22:05:35 -07:00 |
|
danielgrippi
|
7893129435
|
prevent user from hitting aspectmemberships controller before response on dropdowns
|
2011-05-11 17:07:58 -07:00 |
|
danielgrippi
|
9f3044838d
|
Views for contactscontroller#sharing almost done, cuke for editing aspect memberships started
|
2011-05-11 14:53:43 -07:00 |
|
danielgrippi
|
cc01beb3d0
|
cross-browser opacity mixin
|
2011-03-22 12:40:44 -07:00 |
|
danielgrippi
|
48598a9942
|
added linear-gradient mixin.
|
2011-03-22 12:35:03 -07:00 |
|
danielgrippi
|
cb533c8675
|
added box-shadow and border-radius mixins. changed _mixins.sass to _mixins.scss
|
2011-03-22 12:02:54 -07:00 |
|