From d19d0f068c914ec7062ad6d876f20952a7a45a79 Mon Sep 17 00:00:00 2001
From: Fred Chasen <fchasen@gmail.com>
Date: Mon, 11 Feb 2013 21:16:33 -0800
Subject: [PATCH] added grunt js and updates css for sliding

---
 .DS_Store                                     | Bin 21508 -> 21508 bytes
 css/main.css                                  |  32 +++++++-----------
 fpjs/reader/app.js                            |   2 +-
 .../render/{ => workers}/loader_filesystem.js |   0
 fpjs/render/{ => workers}/loader_indexeddb.js |   0
 grunt.js                                      |  22 ++++++++++++
 index.html                                    |   5 ++-
 package.json                                  |   7 ++++
 8 files changed, 47 insertions(+), 21 deletions(-)
 rename fpjs/render/{ => workers}/loader_filesystem.js (100%)
 rename fpjs/render/{ => workers}/loader_indexeddb.js (100%)
 create mode 100644 grunt.js
 create mode 100644 package.json

diff --git a/.DS_Store b/.DS_Store
index c09dc4f0d513089a8a518aa27dc30c5bbe7df8b3..a8dae9fc10e17f0f7c58eb1fb985236e356a1123 100644
GIT binary patch
delta 444
zcmZo!!Pv5bae@>R3)e&$V^L`a1_ovZ1_1_!EQaEo;<AFIocyGX7Z)>6HZWnC*e$r3
zQ743vLrGahl1Gk*d$OUhBnRgeNexXcZJo)EdeW0;>b_%k$Xqb_gO<bOQ+gWA5sYz@
zzv|7Oyk0q!2WT`S5CZ`R_r{CjESuGNo-i}=PMjdInMdF`KO^sE9));z_7sLphGK@2
z$$WxElY11rIawHBB2ntfjO!=&t0i+wR971s8R#e&nww1iqb9>zQ(ITxFnPUzJY&;j
z9S!%%o<a{ege9e<Wn_7ICL3r<OfJ?GViQ&bx?2|LOsUCBHTgM&!LA0&OL7%wR;3Cg
z0{tR9`M#zmqwr)-EiDdV2S+Do7am@a34GyYsYS(^`FR4~oE$(^iCWq~RlQnftirsq
zyfKpnMI`w-B2yAeQXNxLQd5*6f#5QkOH^pGoA#!SR}7dZvl|Grv2ZakDDZ5&_?~$(
szlp94C^SHU(g2~s;R7U?fLw;jF(wNqON&cw7FLa5LJJm!#Vi&w01uOI!vFvP

delta 399
zcmZo!!Pv5bae@>RL)%0dV^K*41_ovZ1_1_!EQaE;;G(>o{Jivuh02o+Ojss!vj|R>
z5a5|SQB7vEpoKF#CnHcb5O8pBR+JKF*{sg<gqe|Nvx>lT{)r6|Ko*ZeJo{u%4WY?>
zY8jJz6}%?%X}U0r@FY%tp<F%rf~LXbvx-J+0+LeFGP08ouu4r1(h_15P*hS@k)2$q
zEhQSAl30@JT$BnVQ#d%T2xw?(Y3qO#a)%UWR;3Cga&TS|n7mI*lS9D5(#qO~hj(%S
ztAuc9PGVAOjz9`0P>X}3ld}s%oG-jAwWv5VKTp6LBs1ATTbof}a*nncs{pSoZ_MQR
z;u4ehYx7R7mv9z5%y5R`I>TLt=M3)|zA$`e_%T^QXZvPhmRLr1Nucw%<#;9^WR=`J
zfmMhRs6KM?Z#E(3Fvf(*0_^iAmK0BBHxOoHXk%bd;Mpw5@t%1yzlkn5tPX%eYqAZG
W^yC<mxtss0<S`+Ij{IU43mE{UxouJa

diff --git a/css/main.css b/css/main.css
index f60e772..4e1debe 100755
--- a/css/main.css
+++ b/css/main.css
@@ -9,10 +9,11 @@ body {
   width: 100%;
   height: 100%;
   /* left: 40px; */ 
-  -webkit-transform: translate(40px, 0);
-  -moz-transform: translate(40px, 0);
+/*   -webkit-transform: translate(40px, 0);
+  -moz-transform: translate(40px, 0); */
     
-  border-radius: 5px 0px 0px 5px;
+  /* border-radius: 5px 0px 0px 5px; */
+  border-radius: 5px;
   background: #fff;
   overflow: hidden;
   -webkit-transition: -webkit-transform .5s;
@@ -23,6 +24,7 @@ body {
   box-shadow:         inset 0 0 50px rgba(0,0,0,.1);
 }
 
+
 #titlebar {
   
   height: 8%;
@@ -125,7 +127,12 @@ body {
   padding: 10px 0;
 }
 
-#controls #open {
+#opener {
+  padding: 10px 10px;
+  float: left;
+}
+
+#opener #open {
   width: 25px;
 }
 
@@ -335,6 +342,8 @@ input:-moz-placeholder {
   #main {
     -webkit-transform: translate(0, 0);
     -moz-transform: translate(0, 0);
+    -webkit-transition: -webkit-transform .3s;
+    -moz-transition: -moz-transform .3s;
   }
   
   #main.closed {
@@ -347,21 +356,6 @@ input:-moz-placeholder {
     margin: 0 50px 0 50px;
   }
   
-  #open {
-    position: fixed;
-    top: 10px;
-    left: 0;
-    z-index: 110;
-    display: block;
-    
-    -webkit-transition: -webkit-transform .5s;
-    -moz-transition: -moz-transform .5s;
-  }
-  
-  #sidebar.open #open {
-    -webkit-transform: translate(260px, 0);
-    -moz-transform: translate(260px, 0);
-  }
   
   #toc {
     width: 260px;
diff --git a/fpjs/reader/app.js b/fpjs/reader/app.js
index cb0fab3..ddffbee 100644
--- a/fpjs/reader/app.js
+++ b/fpjs/reader/app.js
@@ -6,7 +6,7 @@ FPR.app.init = (function($){
   "use strict";
   var Book,
   	  offline = false,
-  	  sidebarWidth = 40,
+  	  sidebarWidth = 0,
   	  windowWidth;
 
   function init(bookURL){
diff --git a/fpjs/render/loader_filesystem.js b/fpjs/render/workers/loader_filesystem.js
similarity index 100%
rename from fpjs/render/loader_filesystem.js
rename to fpjs/render/workers/loader_filesystem.js
diff --git a/fpjs/render/loader_indexeddb.js b/fpjs/render/workers/loader_indexeddb.js
similarity index 100%
rename from fpjs/render/loader_indexeddb.js
rename to fpjs/render/workers/loader_indexeddb.js
diff --git a/grunt.js b/grunt.js
new file mode 100644
index 0000000..bec5577
--- /dev/null
+++ b/grunt.js
@@ -0,0 +1,22 @@
+module.exports = function(grunt) {
+
+	// Project configuration.
+	grunt.initConfig({
+	  pkg: '<json:package.json>',
+	  meta: {
+		banner: '/*! <%= pkg.name %> - v<%= pkg.version %> - ' +
+		  '<%= grunt.template.today("yyyy-mm-dd") %> */'
+	  },
+	  min: {
+		dist: {
+		  src: ['<banner>', 'fpjs/render/*.js'],
+		  dest: 'dist/built.min.js'
+		}
+	  }
+	});
+	
+	// Default task(s).
+	grunt.registerTask('default', ['min']);
+	
+};
+
diff --git a/index.html b/index.html
index 47680e9..a63d372 100755
--- a/index.html
+++ b/index.html
@@ -53,7 +53,7 @@
     <body>
         <div id="sidebar">
           <div id="controls">
-            <a id="open"><img src="img/menu-icon.png"></a>
+            
             <input id="search" placeholder="search">
             <a id="network"><img id="store" src="img/save.png"></a>
             <a id="setting"><img id="settings" src="img/settings.png"></a>
@@ -66,6 +66,9 @@
             
         </div>
         <div id="main">
+          <div id="opener">
+            <a id="open"><img src="img/menu-icon.png"></a>
+          </div>
           <div id="titlebar">
             <span id="book-title"></span>
             <span id="title-seperator">&nbsp;&nbsp;–&nbsp;&nbsp;</span>
diff --git a/package.json b/package.json
new file mode 100644
index 0000000..a5140b1
--- /dev/null
+++ b/package.json
@@ -0,0 +1,7 @@
+{
+  "name": "FuturePress",
+  "version": "0.1.0",
+  "devDependencies": {
+    "grunt": "0.3.17"
+  }
+}
\ No newline at end of file