my/cakes#edit.

8 files changed, 21 insertions, 19 deletions

diff --git a/app/assets/javascripts/backbone/templates/cakes/edit.jst.ejs b/app/assets/javascripts/backbone/templates/cakes/edit.jst.ejs
index d1f26560..5f73d117 100644
--- a/app/assets/javascripts/backbone/templates/cakes/edit.jst.ejs
+++ b/app/assets/javascripts/backbone/templates/cakes/edit.jst.ejs
@@ -34,8 +34,6 @@
       <button id='save-button' type="submit" class="btn btn-primary">Publish</button>
       <a href="#cakes/<%= cake.id %>" class="btn btn-secondary">Cancel</a>
     </form>
+    <div class="card-columns"></div>
   </div>
 </div>
-<div class="row">
-  <ul class="thumbnails"></ul>
-</div>
diff --git a/app/assets/javascripts/backbone/templates/cakes/thumbnail.jst.ejs b/app/assets/javascripts/backbone/templates/cakes/thumbnail.jst.ejs
index 66533081..f704d65a 100644
--- a/app/assets/javascripts/backbone/templates/cakes/thumbnail.jst.ejs
+++ b/app/assets/javascripts/backbone/templates/cakes/thumbnail.jst.ejs
@@ -1,11 +1,9 @@
-<div class="thumbnail">
-  <% if (uploading()) { %>
-    <div class="progress progress-striped active">
-      <div class="bar" style="width: <%= percentComplete %>%;"></div>
-    </div>
-  <% } else { %>
-    <a href="#cakes/<%= cake_id %>/photos/<%= id %>">
-      <img src="<%= thumb_url %>" />
-    </a>
-  <% } %>
-</div>
+<% if (uploading()) { %>
+  <div class="progress progress-striped active">
+    <div class="bar" style="width: <%= percentComplete %>%;"></div>
+  </div>
+<% } else { %>
+  <a href="#cakes/<%= cake_id %>/photos/<%= id %>">
+    <img src="<%= thumb_url %>" class="card-img-top" />
+  </a>
+<% } %>
diff --git a/app/assets/javascripts/backbone/views/cakes/edit_view.js.coffee b/app/assets/javascripts/backbone/views/cakes/edit_view.js.coffee
index c568ca95..84883bd3 100644
--- a/app/assets/javascripts/backbone/views/cakes/edit_view.js.coffee
+++ b/app/assets/javascripts/backbone/views/cakes/edit_view.js.coffee
@@ -4,7 +4,7 @@ CakeSide.Views.Cakes ||= {}
 class CakeSide.Views.Cakes.EditView extends Marionette.CompositeView
   template : JST["backbone/templates/cakes/edit"]
   childView: CakeSide.Views.Cakes.ThumbnailView
-  childViewContainer: '.thumbnails'
+  childViewContainer: '.card-columns'
   ui:
     name: "#cake_name"
     description: "#cake_story"
diff --git a/app/assets/javascripts/backbone/views/cakes/show_view.js.coffee b/app/assets/javascripts/backbone/views/cakes/show_view.js.coffee
index d180b80a..d225e93f 100644
--- a/app/assets/javascripts/backbone/views/cakes/show_view.js.coffee
+++ b/app/assets/javascripts/backbone/views/cakes/show_view.js.coffee
@@ -4,7 +4,7 @@ CakeSide.Views.Cakes ||= {}
 class CakeSide.Views.Cakes.ShowView extends Marionette.CompositeView
   template: JST["backbone/templates/cakes/show"]
   childView: CakeSide.Views.Cakes.ThumbnailView
-  childViewContainer: '.thumbnails'
+  childViewContainer: '.card-columns'
 
   events:
     "click .add-photo": "launchAddPhoto"
diff --git a/app/assets/javascripts/backbone/views/cakes/thumbnail_view.js.coffee b/app/assets/javascripts/backbone/views/cakes/thumbnail_view.js.coffee
index 5e772232..085a8f11 100644
--- a/app/assets/javascripts/backbone/views/cakes/thumbnail_view.js.coffee
+++ b/app/assets/javascripts/backbone/views/cakes/thumbnail_view.js.coffee
@@ -2,8 +2,8 @@ CakeSide.Views.Cakes ||= {}
 
 class CakeSide.Views.Cakes.ThumbnailView extends Marionette.ItemView
   template: JST['backbone/templates/cakes/thumbnail']
-  tagName: 'li'
-  className: 'span2'
+  tagName: 'div'
+  className: 'card'
   modelEvents:
     'sync': 'render'
     'change:percentComplete': 'render'
diff --git a/app/assets/stylesheets/application.css.scss b/app/assets/stylesheets/application.css.scss
index a75e46d8..5376d6cc 100644
--- a/app/assets/stylesheets/application.css.scss
+++ b/app/assets/stylesheets/application.css.scss
@@ -17,6 +17,7 @@
 
 @import "font-awesome";
 @import "bootstrap";
+@import "my-kitchens";
 
 .hide {
   display: none;
diff --git a/app/assets/stylesheets/my-kitchens.css.scss b/app/assets/stylesheets/my-kitchens.css.scss
new file mode 100644
index 00000000..b2a847ac
--- /dev/null
+++ b/app/assets/stylesheets/my-kitchens.css.scss
@@ -0,0 +1,5 @@
+.my-kitchens.show {
+  #preview-image {
+    max-width: 470px;
+  }
+}
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 6c2cb159..f65eb476 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -23,7 +23,7 @@
 <%= yield :javascript %>
 <%= csrf_meta_tags %>
 </head>
-<body>
+<body class="<%= params[:controller].parameterize %> <%= params[:action] %>">
 <%= render "layouts/header" %>
 <div class="<%= configuration_for(:container_class, 'container') %>">
   <%= render "layouts/messages" %>