diff --git a/.DS_Store b/.DS_Store index c09dc4f..a8dae9f 100644 Binary files a/.DS_Store and b/.DS_Store differ 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: '', + meta: { + banner: '/*! <%= pkg.name %> - v<%= pkg.version %> - ' + + '<%= grunt.template.today("yyyy-mm-dd") %> */' + }, + min: { + dist: { + src: ['', '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 @@