Merge branch 'master' into improving_debates

Conflicts:
	app/assets/stylesheets/debates.scss
	app/assets/stylesheets/participacion.scss

app/assets/javascripts/application.js

@@ -16,17 +16,20 @@
 //= require turbolinks
 //= require ckeditor/init
 //= require social-share-button
+//= require initial
 //= require app
 //= require_tree .
 
 var initialize_modules = function() {
   App.Comments.initialize();
+  App.Users.initialize();
   App.Votes.initialize();
 };
 
 $(function(){
   $(document).foundation();
 
-  $(document).ready(initialize_modules)
-  $(document).on('page:load', initialize_modules)
+  $(document).ready(initialize_modules);
+  $(document).on('page:load', initialize_modules);
+  $(document).on('ajax:complete', initialize_modules);
 });

app/assets/javascripts/comments.js.coffee

@@ -17,7 +17,12 @@ App.Comments =
     $("#js-comment-form-#{id}").toggle()
 
   initialize: ->
-    $('body').on 'click', '.js-add-comment-link', ->
-      id = $(this).data().id
-      App.Comments.toggle_form(id)
-      false
+    $('body .js-add-comment-link').each ->
+      $this = $(this)
+
+      unless $this.data('initialized') is 'yes'
+        $this.on('click', ->
+          id = $(this).data().id
+          App.Comments.toggle_form(id)
+          false
+        ).data 'initialized', 'yes'

app/assets/javascripts/users.js.coffee

@@ -0,0 +1,5 @@
+App.Users =
+
+  initialize: ->
+    $('.initialjs-avatar').initial();
+    false

app/assets/stylesheets/debates.scss

@@ -383,9 +383,6 @@
   }
 
   .author-photo {
-    border-radius: 2px;
-    display: inline-block;
-    height: 32px;
     line-height: $line-height*2;
     margin-right: rem-calc(6);
     vertical-align: middle;
@@ -539,16 +536,6 @@
       }
     }
 
-    .user-photo {
-      border-radius: 2px;
-      display: inline-block;
-      height: 32px;
-      line-height: $line-height*2;
-      margin-right: rem-calc(6);
-      vertical-align: top;
-      width: 32px;
-    }
-
     .comment-body {
       margin-left: rem-calc(36);
 

app/assets/stylesheets/participacion.scss

@@ -517,6 +517,10 @@ form {
     margin-bottom: rem-calc(24);
   }
 
+  .initialjs-avatar {
+    margin-bottom: $line-height;
+  }
+
   h2 {
     clear: both;
     font-size: rem-calc(30);