Permalink
Browse files

Include avatars_for_rails css and bump its version. Fixes #20

  • Loading branch information...
1 parent 52ffdac commit 350f457c8080fec308337a814e37dc65ca0d305a @rafaelgg rafaelgg committed Apr 10, 2012
Showing with 7 additions and 2 deletions.
  1. +3 −0 Gemfile
  2. +3 −2 Gemfile.lock
  3. +1 −0 app/assets/stylesheets/application.css.scss
View
@@ -35,6 +35,9 @@ git 'git://github.com/ging/vish_editor.git', :branch => 'stable' do
gem 'vish_editor'
end
+# Force the first version of avatars_for_rails that does not collide with bootstrap
+gem 'avatars_for_rails', '~> 0.2.6'
+
#gem 'vish_editor', :path => '../vish_editor/rails'
# We do not know the reasons for this gem:
View
@@ -1,6 +1,6 @@
GIT
remote: git://github.com/ging/social_stream.git
- revision: 94d21466293fb4ec5c7d238a0bac5168eccfb4ef
+ revision: 6b50b320c5aae45b902e88c86a866a7113d7b1b1
branch: vish
specs:
social_stream-base (0.19.0)
@@ -80,7 +80,7 @@ GEM
ancestry (1.2.5)
activerecord (>= 2.2.2)
arel (3.0.2)
- avatars_for_rails (0.2.5)
+ avatars_for_rails (0.2.6)
foreigner (>= 0.9.1)
jquery-rails (>= 1.0.9)
paperclip (>= 2.3.4)
@@ -322,6 +322,7 @@ PLATFORMS
ruby
DEPENDENCIES
+ avatars_for_rails (~> 0.2.6)
capistrano
capybara
coffee-rails (~> 3.2.2)
@@ -8,6 +8,7 @@
* require social_stream-events
* require social_stream-linkser
* require social_stream-presence
+ *= require avatars_for_rails
*= require_tree .
*/

4 comments on commit 350f457

Contributor

crispinh2o replied Apr 11, 2012

Where is the avatars_for_rails.css?

would have to modify it so it does not modify all Vish site.

in particular,

/** a:link, a:visited {color: inherit; text-decoration: inherit;} **/

Contributor

crispinh2o replied Apr 11, 2012

thanks!!

Contributor

diegocarrera replied Apr 11, 2012

now it is fixed on vish

Please sign in to comment.