Merge branch 'master' into production

app/assets/stylesheets/recipes.scss

@@ -6,6 +6,10 @@ div.table_tags {
   width: 275px;
 }
 
+div.recipe_list_controls {
+  width: 85px;
+}
+
 @mixin editor {
 
   @extend .well;

app/views/recipes/index.html.erb

@@ -61,6 +61,7 @@
 
               <td>
                 <% if current_user? %>
+                  <div class="recipe_list_controls">
                     <%= link_to new_recipe_log_path(recipe), class: 'btn btn-xs btn-primary' do %>
                       <span class="glyphicon glyphicon-copy"></span>
                     <% end %>
@@ -70,6 +71,7 @@
                     <%= link_to recipe, method: :delete, data: { confirm: 'Are you sure?' }, class: 'btn btn-xs btn-danger' do %>
                       <span class="glyphicon glyphicon-remove"></span>
                     <% end %>
+                  </div>
                 <% end %>
               </td>
             </tr>