move third party css and js to vendor folder.

app/assets/images/rails.png

Binary file

@@ -1,22 +0,0 @@
-function Player() {
-}
-Player.prototype.play = function(song) {
-  this.currentlyPlayingSong = song;
-  this.isPlaying = true;
-};
-
-Player.prototype.pause = function() {
-  this.isPlaying = false;
-};
-
-Player.prototype.resume = function() {
-  if (this.isPlaying) {
-    throw new Error("song is already playing");
-  }
-
-  this.isPlaying = true;
-};
-
-Player.prototype.makeFavorite = function() {
-  this.currentlyPlayingSong.persistFavoriteStatus(true);
-};

@@ -1,7 +0,0 @@
-function Song() {
-}
-
-Song.prototype.persistFavoriteStatus = function(value) {
-  // something complicated
-  throw new Error("not yet implemented");
-};
\ No newline at end of file

@@ -2,6 +2,9 @@
  * This is a manifest file that'll automatically include all the stylesheets available in this directory
  * and any sub-directories. You're free to add application-wide styles to this file and they'll appear at
  * the top of the compiled file, but it's generally better to create a new file per style scope.
+ *= require bootstrap
+ *= require bootstrap-responsive
+ *= require jquery.Jcrop
  *= require_self
  *= require_tree . 
 */

@@ -5,12 +5,6 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
     <title><%= full_title(yield(:title)) %></title>
     <%= stylesheet_link_tag :application %>
-    <style type="text/css">
-    body { 
-      padding-top: 60px; 
-      padding-bottom: 40px; 
-    }
-    </style>
     <link rel="shortcut icon" href="/assets/favicon.ico">
     <link rel="apple-touch-icon" href="/assets/apple-touch-icon.png">
     <link rel="apple-touch-icon" sizes="72x72" href="/assets/apple-touch-icon-72x72.png">
@@ -25,7 +19,8 @@
   <body>
     <%= render "shared/header" %>
     <div class="container">
-      <div class="content">
+      <div class="row">
+        <div class="span12">
         <% if notice %>
           <div class="alert alert-success">
             <a class="close">×</a>
@@ -40,8 +35,9 @@
             <%= alert %>
           </div>
         <% end %>
-        <%= yield %>
+        </div>
       </div>
+      <%= yield %>
     </div> <!-- /container -->
     <%= render "shared/footer" %>
     <%= render "shared/uservoice_feedback"%>

@@ -1,24 +1,26 @@
 <div class="row">
-  <ul class="thumbnails">
-    <% @creations.each do |creation| %>
-      <li class="span3">
-      <div class="thumbnail">
-        <div class="caption">
-          <h5><a href="<%= url_for creation %>"><%= short_name(creation, 20) %></a></h5>
-          <h6><a href="<%= url_for profile_path(creation.user) %>"><%= creation.user.name %></a></h6>
-          <a href="<%= url_for creation %>"><img src="<%= creation.image.thumb.url %>" alt="<%= creation.name %>" width="260" height="180" /></a>
-          <p>
-          <% if creation.favorites.count > 0 %>
-            <a href="<%= url_for creation_favorites_path(:creation_id => creation.id) %>"><%= creation.favorites.count %><i class="icon-heart"></i></a>
-          <% else %>
-            &nbsp;
-          <% end %>
-          </p>
+  <div class="span12">
+    <ul class="thumbnails">
+      <% @creations.each do |creation| %>
+        <li class="span3">
+        <div class="thumbnail">
+          <div class="caption">
+            <h5><a href="<%= url_for creation %>"><%= short_name(creation, 20) %></a></h5>
+            <h6><a href="<%= url_for profile_path(creation.user) %>"><%= creation.user.name %></a></h6>
+            <a href="<%= url_for creation %>"><img src="<%= creation.image.thumb.url %>" alt="<%= creation.name %>" width="260" height="180" /></a>
+            <p>
+            <% if creation.favorites.count > 0 %>
+              <a href="<%= url_for creation_favorites_path(:creation_id => creation.id) %>"><%= creation.favorites.count %><i class="icon-heart"></i></a>
+            <% else %>
+              &nbsp;
+            <% end %>
+            </p>
+          </div>
         </div>
-      </div>
-      </li>
-    <% end %>
-  </ul>
+        </li>
+      <% end %>
+    </ul>
+  </div>
 </div>
 
 <%= render "shared/paging" %>

@@ -1,58 +0,0 @@
-describe("Player", function() {
-  var player;
-  var song;
-
-  beforeEach(function() {
-    player = new Player();
-    song = new Song();
-  });
-
-  it("should be able to play a Song", function() {
-    player.play(song);
-    expect(player.currentlyPlayingSong).toEqual(song);
-
-    //demonstrates use of custom matcher
-    expect(player).toBePlaying(song);
-  });
-
-  describe("when song has been paused", function() {
-    beforeEach(function() {
-      player.play(song);
-      player.pause();
-    });
-
-    it("should indicate that the song is currently paused", function() {
-      expect(player.isPlaying).toBeFalsy();
-
-      // demonstrates use of 'not' with a custom matcher
-      expect(player).not.toBePlaying(song);
-    });
-
-    it("should be possible to resume", function() {
-      player.resume();
-      expect(player.isPlaying).toBeTruthy();
-      expect(player.currentlyPlayingSong).toEqual(song);
-    });
-  });
-
-  // demonstrates use of spies to intercept and test method calls
-  it("tells the current song if the user has made it a favorite", function() {
-    spyOn(song, 'persistFavoriteStatus');
-
-    player.play(song);
-    player.makeFavorite();
-
-    expect(song.persistFavoriteStatus).toHaveBeenCalledWith(true);
-  });
-
-  //demonstrates use of expected exceptions
-  describe("#resume", function() {
-    it("should throw an exception if song is already playing", function() {
-      player.play(song);
-
-      expect(function() {
-        player.resume();
-      }).toThrow("song is already playing");
-    });
-  });
-});
\ No newline at end of file

File renamed without changes

Commit aa0516ab

Commit `aa0516ab`