Skip to content
This repository
Browse code

Include avatars_for_rails css and bump its version. Fixes #20

  • Loading branch information...
commit 350f457c8080fec308337a814e37dc65ca0d305a 1 parent 52ffdac
Rafael García Gallego rafaelgg authored
3  Gemfile
@@ -35,6 +35,9 @@ git 'git://github.com/ging/vish_editor.git', :branch => 'stable' do
35 35 gem 'vish_editor'
36 36 end
37 37
  38 +# Force the first version of avatars_for_rails that does not collide with bootstrap
  39 +gem 'avatars_for_rails', '~> 0.2.6'
  40 +
38 41 #gem 'vish_editor', :path => '../vish_editor/rails'
39 42
40 43 # We do not know the reasons for this gem:
5 Gemfile.lock
... ... @@ -1,6 +1,6 @@
1 1 GIT
2 2 remote: git://github.com/ging/social_stream.git
3   - revision: 94d21466293fb4ec5c7d238a0bac5168eccfb4ef
  3 + revision: 6b50b320c5aae45b902e88c86a866a7113d7b1b1
4 4 branch: vish
5 5 specs:
6 6 social_stream-base (0.19.0)
@@ -80,7 +80,7 @@ GEM
80 80 ancestry (1.2.5)
81 81 activerecord (>= 2.2.2)
82 82 arel (3.0.2)
83   - avatars_for_rails (0.2.5)
  83 + avatars_for_rails (0.2.6)
84 84 foreigner (>= 0.9.1)
85 85 jquery-rails (>= 1.0.9)
86 86 paperclip (>= 2.3.4)
@@ -322,6 +322,7 @@ PLATFORMS
322 322 ruby
323 323
324 324 DEPENDENCIES
  325 + avatars_for_rails (~> 0.2.6)
325 326 capistrano
326 327 capybara
327 328 coffee-rails (~> 3.2.2)
1  app/assets/stylesheets/application.css.scss
@@ -8,6 +8,7 @@
8 8 * require social_stream-events
9 9 * require social_stream-linkser
10 10 * require social_stream-presence
  11 + *= require avatars_for_rails
11 12 *= require_tree .
12 13 */
13 14

4 comments on commit 350f457

Crispín Avís
Owner

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;} **/

Crispín Avís
Owner

thanks!!

Diego Carrera
Owner

now it is fixed on vish

Please sign in to comment.
Something went wrong with that request. Please try again.