increased shelf front brightness, added control panel for icons

kristenhazard · Jan 22, 2012 · 7e7060a · 7e7060a
1 parent a8d4863
commit 7e7060a
Show file tree

Hide file tree

Showing 5 changed files with 51 additions and 28 deletions.
diff --git a/app/assets/images/icon_search.png b/app/assets/images/icon_search.png
diff --git a/app/assets/images/icon_sort.png b/app/assets/images/icon_sort.png
diff --git a/app/assets/images/shelf_row.png b/app/assets/images/shelf_row.png
diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css
@@ -20,14 +20,31 @@ body {
   text-align: center;
 }
 
+.container {
+  margin-left: auto;
+  margin-right: auto;
+  padding: 0;
+  width: 1108px;
+}
+
+.control_panel {
+  margin-top: 272px;
+  padding-left: 20px;
+  float: left;
+}
+
+.control_panel img {
+  margin-bottom: 64px;
+}
+
 /* Bookshelf styling */
 
 .bookshelf {
-  margin-left: auto;
-  margin-right: auto;
+  float: left;
+  margin: 0;
+  padding: 0;
   background-image: url('/assets/shelf_background.jpg');
   width: 1024px;
-  padding: 0;
 }
 
 .bookshelf_walls {
@@ -58,8 +75,8 @@ body {
   float: left;
   margin: 0;
   padding: 0;
-  padding-top: 25px;
+  padding-top: 50px;
   background-image: url('/assets/book_shadow.png');
   width: 192px;
-  height: 227px;
+  height: 202px;
 }
diff --git a/app/views/bookshelf/index.html.erb b/app/views/bookshelf/index.html.erb
@@ -1,26 +1,32 @@
-<div class="bookshelf">
-  <div class="bookshelf_walls">
-    <div class="bookshelf_row">
-      <div class="book"><%= image_tag "book.png" %></div>
-      <div class="book"><%= image_tag "book.png" %></div>
-      <div class="book"><%= image_tag "book.png" %></div>
-      <div class="book"><%= image_tag "book.png" %></div>
-      <div class="book"><%= image_tag "book.png" %></div>
+<div class="container">
+  <div class="bookshelf">
+    <div class="bookshelf_walls">
+      <div class="bookshelf_row">
+        <div class="book"><%= image_tag "" %></div>
+        <div class="book"><%= image_tag "" %></div>
+        <div class="book"><%= image_tag "" %></div>
+        <div class="book"><%= image_tag "" %></div>
+        <div class="book"><%= image_tag "" %></div>
+      </div>
+      <div class="bookshelf_row">
+        <div class="book"><%= image_tag "" %></div>
+        <div class="book"><%= image_tag "" %></div>
+        <div class="book"><%= image_tag "" %></div>
+        <div class="book"><%= image_tag "" %></div>
+        <div class="book"><%= image_tag "" %></div>
+      </div>
+      <div class="bookshelf_row">
+        <div class="book"><%= image_tag "" %></div>
+        <div class="book"><%= image_tag "" %></div>
+        <div class="book"><%= image_tag "" %></div>
+        <div class="book"><%= image_tag "" %></div>
+        <div class="book"><%= image_tag "" %></div>
+      </div>
+      <!--<div class="bookshelf_under_shadow"></div>-->
     </div>
-    <div class="bookshelf_row">
-      <div class="book"><%= image_tag "book.png" %></div>
-      <div class="book"><%= image_tag "book.png" %></div>
-      <div class="book"><%= image_tag "book.png" %></div>
-      <div class="book"><%= image_tag "book.png" %></div>
-      <div class="book"><%= image_tag "book.png" %></div>
-    </div>
-    <div class="bookshelf_row">
-      <div class="book"><%= image_tag "book.png" %></div>
-      <div class="book"><%= image_tag "book.png" %></div>
-      <div class="book"><%= image_tag "book.png" %></div>
-      <div class="book"><%= image_tag "book.png" %></div>
-      <div class="book"><%= image_tag "book.png" %></div>
-    </div>
-    <!--<div class="bookshelf_under_shadow"></div>-->
+  </div>
+  <div class="control_panel">
+    <%= image_tag "icon_search.png" %><br />
+    <%= image_tag "icon_sort.png" %>
   </div>
 </div>