Commit bdad1e75

@@ -32,10 +32,8 @@ class ImageUploader < CarrierWave::Uploader::Base
   # Process files as they are uploaded:
 
   process :set_content_type
-  # process :resize_to_fit => [420, 300]
-  # process :resize_to_fit => [560, 400]
-  process :resize_to_fit => [700, 540]
-  # process :resize_to_fit => [140, 100]
+  # process :resize_to_fit => [700, 540]
+  process :resize_to_fit => [660, 470]
   process :convert => 'png'
   # process :scale => [200, 300]
   #
@@ -45,7 +43,7 @@ class ImageUploader < CarrierWave::Uploader::Base
 
   # Create different versions of your uploaded files:
   version :thumb do
-    process :resize_to_fill => [140, 100]
+    process :resize_to_fill => [210, 150]
   end
 
   # Add a white list of extensions which are allowed to be uploaded.

@@ -18,9 +18,9 @@
   </div>
   <div class="span4">
     <ul class="media-grid">
-      <li> <a href=""><img class="thumbnail" src="<%= @creation.image_url.to_s%>" alt="<%= @creation.name %>" style="width:210px"></a> </li>
-      <li> <a href=""><img class="thumbnail" src="<%= @creation.image_url.to_s%>" alt="<%= @creation.name %>" style="width:210px"></a> </li>
-      <li> <a href=""><img class="thumbnail" src="<%= @creation.image_url.to_s%>" alt="<%= @creation.name %>" style="width:210px"></a> </li>
+      <li> <a href=""><img class="thumbnail" src="<%= @creation.image.thumb.url.to_s%>" alt="<%= @creation.name %>"></a> </li>
+      <li> <a href=""><img class="thumbnail" src="<%= @creation.image.thumb.url.to_s%>" alt="<%= @creation.name %>"></a> </li>
+      <li> <a href=""><img class="thumbnail" src="<%= @creation.image.thumb.url.to_s%>" alt="<%= @creation.name %>"></a> </li>
     </ul>
   </div>
 </div>

@@ -31,7 +31,6 @@
           <ul class="nav">
             <li class="active"><a href="<%= url_for home_index_path %>">Home</a></li>
             <li><%= link_to "Share", new_creation_path, :style => "color:#48ce62;" %></li>
-            <%# <li><%= link_to "Artists", all_profiles_path  %></li>%>
             <li class="dropdown">
             <a href="#" class="dropdown-toggle">Categories</a>
             <ul class="dropdown-menu">
@@ -51,7 +50,7 @@
           </ul>
           <%= form_tag(search_index_path, :method => "get", :name => "search", :class => "pull-left") do %>
             <input name="q" type="text" placeholder="Search" />
-            <input type="submit" value="search" />
+            <%# <input type="submit" value="search" />%>
           <% end %>
           <% if user_signed_in? %>
             <p class="pull-right">Logged in as <%= link_to current_user.name, profiles_mine_path %> | <%= link_to "sign out", destroy_user_session_path %></p>