couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gar...@apache.org
Subject [06/13] git commit: updated refs/heads/master to a9c390e
Date Thu, 08 Aug 2013 13:26:14 GMT
Fauxton:
Remove the icons for now
Fix for layout
Removing all the CloseMenu primary nav stuff for now
Fix for Establish & beforeRender Issue.
Update index underscore.
Fixing redundant fauxton css.
HTML update for the dropdown
Move Window resize
Update Lodash and BB Layoutmanager
Nav Active state on load
Bulk edit added back in

SVG custom edits for legends


Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/7d376196
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/7d376196
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/7d376196

Branch: refs/heads/master
Commit: 7d3761964cf082a0dd59940d70a7fd1b2b3102d8
Parents: 365f7b9
Author: suelockwood <deathbearbrown@gmail.com>
Authored: Fri Jul 12 16:14:51 2013 -0400
Committer: Garren Smith <garren.smith@gmail.com>
Committed: Thu Aug 8 15:21:26 2013 +0200

----------------------------------------------------------------------
 src/fauxton/app/addons/auth/base.js             |    2 +
 src/fauxton/app/addons/config/base.js           |    2 +-
 .../app/addons/config/templates/dashboard.html  |    2 +-
 src/fauxton/app/addons/logs/base.js             |    2 +-
 src/fauxton/app/addons/stats/base.js            |    2 +-
 src/fauxton/app/addons/stats/routes.js          |    5 +
 src/fauxton/app/api.js                          |    8 +-
 src/fauxton/app/modules/databases/routes.js     |    8 +-
 src/fauxton/app/modules/databases/views.js      |   53 +
 src/fauxton/app/modules/documents/resources.js  |    2 +-
 src/fauxton/app/modules/documents/routes.js     |   29 +-
 src/fauxton/app/modules/documents/views.js      |   34 +-
 src/fauxton/app/modules/fauxton/base.js         |   68 +-
 src/fauxton/app/modules/fauxton/layout.js       |    4 +-
 src/fauxton/app/templates/databases/list.html   |    7 +-
 .../app/templates/databases/newdatabase.html    |   17 +
 .../app/templates/documents/all_docs_list.html  |    1 -
 src/fauxton/app/templates/documents/doc.html    |    2 +-
 .../app/templates/documents/edit_tools.html     |   44 +
 .../app/templates/documents/jumpdoc.html        |   20 +
 .../app/templates/documents/sidebar.html        |   66 +-
 .../app/templates/documents/view_editor.html    |    4 +-
 .../app/templates/fauxton/breadcrumbs.html      |    2 +-
 src/fauxton/app/templates/fauxton/nav_bar.html  |   44 +-
 src/fauxton/app/templates/layouts/one_pane.html |   13 +-
 src/fauxton/app/templates/layouts/two_pane.html |   12 +-
 .../templates/layouts/with_right_sidebar.html   |   11 +-
 .../app/templates/layouts/with_sidebar.html     |   16 +-
 .../app/templates/layouts/with_tabs.html        |    8 +-
 .../templates/layouts/with_tabs_sidebar.html    |   32 +-
 src/fauxton/app/windowResize.js                 |   41 +
 src/fauxton/assets/img/fontcustom_fauxton.eot   |  Bin 0 -> 7364 bytes
 src/fauxton/assets/img/fontcustom_fauxton.svg   |  200 ++
 src/fauxton/assets/img/fontcustom_fauxton.ttf   |  Bin 0 -> 9636 bytes
 src/fauxton/assets/img/fontcustom_fauxton.woff  |  Bin 0 -> 4816 bytes
 src/fauxton/assets/img/linen.png                |  Bin 0 -> 87134 bytes
 src/fauxton/assets/img/minilogo.png             |  Bin 0 -> 7497 bytes
 src/fauxton/assets/index.underscore             |    7 -
 src/fauxton/assets/js/libs/bootstrap.js         | 2506 ++++++++++--------
 src/fauxton/assets/js/libs/lodash.js            |  634 +++--
 src/fauxton/assets/js/libs/nv.d3.js             |  125 +-
 .../assets/js/plugins/backbone.layoutmanager.js |   36 +-
 src/fauxton/assets/less/bootstrap/alerts.less   |   14 +
 .../assets/less/bootstrap/bootstrap.less        |    8 +-
 .../assets/less/bootstrap/breadcrumbs.less      |   12 +-
 .../assets/less/bootstrap/button-groups.less    |   75 +-
 src/fauxton/assets/less/bootstrap/buttons.less  |   30 +-
 src/fauxton/assets/less/bootstrap/carousel.less |   69 +-
 src/fauxton/assets/less/bootstrap/close.less    |    3 +-
 src/fauxton/assets/less/bootstrap/code.less     |    3 +
 .../assets/less/bootstrap/dropdowns.less        |   53 +-
 src/fauxton/assets/less/bootstrap/forms.less    |   27 +-
 .../assets/less/bootstrap/labels-badges.less    |   14 +-
 src/fauxton/assets/less/bootstrap/media.less    |    4 +-
 src/fauxton/assets/less/bootstrap/mixins.less   |   46 +-
 src/fauxton/assets/less/bootstrap/modals.less   |    7 +-
 src/fauxton/assets/less/bootstrap/navbar.less   |   48 +-
 src/fauxton/assets/less/bootstrap/navs.less     |   66 +-
 src/fauxton/assets/less/bootstrap/pager.less    |    4 +-
 .../assets/less/bootstrap/pagination.less       |    4 +-
 src/fauxton/assets/less/bootstrap/popovers.less |   94 +-
 src/fauxton/assets/less/bootstrap/reset.less    |   86 +-
 .../less/bootstrap/responsive-767px-max.less    |    4 +-
 .../less/bootstrap/responsive-navbar.less       |    8 +-
 .../less/bootstrap/responsive-utilities.less    |   16 +
 .../assets/less/bootstrap/responsive.less       |    2 +-
 .../assets/less/bootstrap/scaffolding.less      |    3 +-
 src/fauxton/assets/less/bootstrap/sprites.less  |   10 +-
 src/fauxton/assets/less/bootstrap/tables.less   |  100 +-
 .../assets/less/bootstrap/tests/buttons.html    |  139 +
 .../assets/less/bootstrap/tests/css-tests.css   |  150 ++
 .../assets/less/bootstrap/thumbnails.less       |    5 +-
 src/fauxton/assets/less/bootstrap/tooltip.less  |   12 +-
 src/fauxton/assets/less/bootstrap/type.less     |   68 +-
 .../assets/less/bootstrap/variables.less        |    6 +-
 src/fauxton/assets/less/fauxton.less            |  664 ++++-
 src/fauxton/assets/less/icons.less              |   99 +
 77 files changed, 4120 insertions(+), 1902 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb/blob/7d376196/src/fauxton/app/addons/auth/base.js
----------------------------------------------------------------------
diff --git a/src/fauxton/app/addons/auth/base.js b/src/fauxton/app/addons/auth/base.js
index acbbcd2..78f95e0 100644
--- a/src/fauxton/app/addons/auth/base.js
+++ b/src/fauxton/app/addons/auth/base.js
@@ -28,6 +28,8 @@ function(app, FauxtonAPI, Auth) {
       title: "Auth", 
       href: "#_auth",
       view: Auth.navLink,
+      icon: "fonticon-user",
+      bottomNav: true,
       establish: [FauxtonAPI.session.fetchUser()]
     });
 

http://git-wip-us.apache.org/repos/asf/couchdb/blob/7d376196/src/fauxton/app/addons/config/base.js
----------------------------------------------------------------------
diff --git a/src/fauxton/app/addons/config/base.js b/src/fauxton/app/addons/config/base.js
index f589b16..8362cb5 100644
--- a/src/fauxton/app/addons/config/base.js
+++ b/src/fauxton/app/addons/config/base.js
@@ -21,7 +21,7 @@ define([
 
 function(app, FauxtonAPI, Config) {
   Config.initialize = function() {
-    FauxtonAPI.addHeaderLink({title: "Config", href: "#_config"});
+    FauxtonAPI.addHeaderLink({title: "Config", href: "#_config", icon:"fonticon-cog", className: 'config'});
   };
 
   return Config;

http://git-wip-us.apache.org/repos/asf/couchdb/blob/7d376196/src/fauxton/app/addons/config/templates/dashboard.html
----------------------------------------------------------------------
diff --git a/src/fauxton/app/addons/config/templates/dashboard.html b/src/fauxton/app/addons/config/templates/dashboard.html
index 7cff90a..0d08727 100644
--- a/src/fauxton/app/addons/config/templates/dashboard.html
+++ b/src/fauxton/app/addons/config/templates/dashboard.html
@@ -14,7 +14,7 @@ the License.
 
 <div class="row">
   <div class="span2 offset10">
-    <button id="add-section" href="#" class="btn btn-primary button-margin">
+    <button id="add-section" href="#" class="button button-margin">
       <i class="icon-plus icon-white"> </i>
       Add Section
     </button>

http://git-wip-us.apache.org/repos/asf/couchdb/blob/7d376196/src/fauxton/app/addons/logs/base.js
----------------------------------------------------------------------
diff --git a/src/fauxton/app/addons/logs/base.js b/src/fauxton/app/addons/logs/base.js
index c17e159..1aecbdf 100644
--- a/src/fauxton/app/addons/logs/base.js
+++ b/src/fauxton/app/addons/logs/base.js
@@ -21,7 +21,7 @@ define([
 
 function(app, FauxtonAPI, Log) {
   Log.initialize = function() {
-    FauxtonAPI.addHeaderLink({title: "Log", href: "#_log"});
+    FauxtonAPI.addHeaderLink({title: "Log", href: "#_log", icon: "fonticon-log", className: 'logs'});
   };
 
   return Log;

http://git-wip-us.apache.org/repos/asf/couchdb/blob/7d376196/src/fauxton/app/addons/stats/base.js
----------------------------------------------------------------------
diff --git a/src/fauxton/app/addons/stats/base.js b/src/fauxton/app/addons/stats/base.js
index 4721399..1b44b8b 100644
--- a/src/fauxton/app/addons/stats/base.js
+++ b/src/fauxton/app/addons/stats/base.js
@@ -19,7 +19,7 @@ define([
 function(app, FauxtonAPI, Stats) {
 
   Stats.initialize = function() {
-    FauxtonAPI.addHeaderLink({title: "Statistics", href: "#stats"});
+    FauxtonAPI.addHeaderLink({title: "Statistics", href: "#stats", icon: "fonticon-stats", className: 'stats'});
   };
 
   return Stats;

http://git-wip-us.apache.org/repos/asf/couchdb/blob/7d376196/src/fauxton/app/addons/stats/routes.js
----------------------------------------------------------------------
diff --git a/src/fauxton/app/addons/stats/routes.js b/src/fauxton/app/addons/stats/routes.js
index 5f1affe..2eeced4 100644
--- a/src/fauxton/app/addons/stats/routes.js
+++ b/src/fauxton/app/addons/stats/routes.js
@@ -25,6 +25,11 @@ function(app, FauxtonAPI, Stats) {
       "stats":"showStats",
       "_stats": "showStats"
     },
+    
+    
+    crumbs: [
+      {"name": "Statistics", "link": "_stats"}
+    ],
 
     selectedHeader: "Statistics",
 

http://git-wip-us.apache.org/repos/asf/couchdb/blob/7d376196/src/fauxton/app/api.js
----------------------------------------------------------------------
diff --git a/src/fauxton/app/api.js b/src/fauxton/app/api.js
index c4aaaf4..a57c68b 100644
--- a/src/fauxton/app/api.js
+++ b/src/fauxton/app/api.js
@@ -256,10 +256,11 @@ function(app, Fauxton) {
       // Only want to redo the template if its a full render
       if (!this.renderedState) {
         masterLayout.setTemplate(this.layout);
-          $('#nav-links li').removeClass('active');
+          $('#primary-navbar li').removeClass('active');
 
         if (this.selectedHeader) {
-          $('#nav-links li[data-nav-name="' + this.selectedHeader + '"]').addClass('active');
+          app.selectedHeader = this.selectedHeader;
+          $('#primary-navbar li[data-nav-name="' + this.selectedHeader + '"]').addClass('active');
         }
       }
 
@@ -284,6 +285,7 @@ function(app, Fauxton) {
         _.each(routeObject.getViews(), function(view, selector) {
           if(view.hasRendered()) { return; }
           if (!view.disableLoader){ $(selector).addClass(view.loaderClassname);}
+          
           FauxtonAPI.when(view.establish()).then(function(resp) {
             masterLayout.setView(selector, view);
             if (!view.disableLoader) $(selector).removeClass(view.loaderClassname);
@@ -295,7 +297,7 @@ function(app, Fauxton) {
             };
             masterLayout.renderView(selector);
           });
-
+          
           var hooks = masterLayout.hooks[selector];
           var boundRoute = route;
 

http://git-wip-us.apache.org/repos/asf/couchdb/blob/7d376196/src/fauxton/app/modules/databases/routes.js
----------------------------------------------------------------------
diff --git a/src/fauxton/app/modules/databases/routes.js b/src/fauxton/app/modules/databases/routes.js
index fe1a441..cdcb3ca 100644
--- a/src/fauxton/app/modules/databases/routes.js
+++ b/src/fauxton/app/modules/databases/routes.js
@@ -24,7 +24,7 @@ define([
 function(app, FauxtonAPI, Databases, Views) {
 
   var AllDbsRouteObject = FauxtonAPI.RouteObject.extend({
-    layout: "with_sidebar",
+    layout: "one_pane",
 
     crumbs: [
       {"name": "Databases", "link": "/_all_dbs"}
@@ -46,9 +46,9 @@ function(app, FauxtonAPI, Databases, Views) {
       this.databases = new Databases.List();
       this.deferred = FauxtonAPI.Deferred();
 
-      this.sidebarView = this.setView("#sidebar-content", new Views.Sidebar({
-        collection: this.databases
-      }));
+      // this.sidebarView = this.setView("#sidebar-content", new Views.Sidebar({
+      //   collection: this.databases
+      // }));
     },
 
     allDatabases: function() {

http://git-wip-us.apache.org/repos/asf/couchdb/blob/7d376196/src/fauxton/app/modules/databases/views.js
----------------------------------------------------------------------
diff --git a/src/fauxton/app/modules/databases/views.js b/src/fauxton/app/modules/databases/views.js
index c1b9bb7..c177264 100644
--- a/src/fauxton/app/modules/databases/views.js
+++ b/src/fauxton/app/modules/databases/views.js
@@ -71,6 +71,12 @@ function(app, Fauxton, FauxtonAPI) {
     },
 
     beforeRender: function() {
+
+      this.insertView("#newButton", new Views.NewDatabaseButton({
+        collection: this.collection
+      }));
+
+
       _.each(this.paginated(), function(database) {
         this.insertView("table.databases tbody", new Views.Item({
           model: database
@@ -123,6 +129,53 @@ function(app, Fauxton, FauxtonAPI) {
     }
   });
 
+
+  Views.NewDatabaseButton = FauxtonAPI.View.extend({
+    template: "templates/databases/newdatabase",
+    events: {
+      "click a#new": "newDatabase"
+    },
+    newDatabase: function() {
+      var notification;
+      var db;
+      // TODO: use a modal here instead of the prompt
+      var name = prompt('Name of database', 'newdatabase');
+      if (name === null) {
+        return;
+      } else if (name.length === 0) {
+        notification = FauxtonAPI.addNotification({
+          msg: "Please enter a valid database name",
+          type: "error",
+          clear: true
+        });
+        return;
+      }
+      db = new this.collection.model({
+        id: encodeURIComponent(name),
+        name: name
+      });
+      notification = FauxtonAPI.addNotification({msg: "Creating database."});
+      db.save().done(function() {
+        notification = FauxtonAPI.addNotification({
+          msg: "Database created successfully",
+          type: "success",
+          clear: true
+        });
+        var route = "#/database/" +  name + "/_all_docs?limit=100";
+        app.router.navigate(route, { trigger: true });
+      }
+      ).error(function(xhr) {
+        var responseText = JSON.parse(xhr.responseText).reason;
+        notification = FauxtonAPI.addNotification({
+          msg: "Create database failed: " + responseText,
+          type: "error",
+          clear: true
+        });
+      }
+      );
+    }
+  });
+
   Views.Sidebar = FauxtonAPI.View.extend({
     template: "templates/databases/sidebar",
     events: {

http://git-wip-us.apache.org/repos/asf/couchdb/blob/7d376196/src/fauxton/app/modules/documents/resources.js
----------------------------------------------------------------------
diff --git a/src/fauxton/app/modules/documents/resources.js b/src/fauxton/app/modules/documents/resources.js
index 0ec44ea..826b44a 100644
--- a/src/fauxton/app/modules/documents/resources.js
+++ b/src/fauxton/app/modules/documents/resources.js
@@ -271,7 +271,7 @@ function(app, FauxtonAPI) {
       that = this;
       this.viewMeta = {
         total_rows: resp.total_rows,
-        offest: resp.offest,
+        offest: resp.offset,
         update_seq: resp.update_seq
       };
       return _.map(resp.rows, function(row) {

http://git-wip-us.apache.org/repos/asf/couchdb/blob/7d376196/src/fauxton/app/modules/documents/routes.js
----------------------------------------------------------------------
diff --git a/src/fauxton/app/modules/documents/routes.js b/src/fauxton/app/modules/documents/routes.js
index 9e68ae3..f712ec3 100644
--- a/src/fauxton/app/modules/documents/routes.js
+++ b/src/fauxton/app/modules/documents/routes.js
@@ -27,9 +27,9 @@ function(app, FauxtonAPI, Documents, Databases) {
 
   var DocEditorRouteObject = FauxtonAPI.RouteObject.extend({
     layout: "one_pane",
-
+    disableLoader: true,
     initialize: function(route, masterLayout, options) {
-      var databaseName = options[0], docID = options[1];
+      var databaseName = options[0], docID = options[1]||'new';
 
       this.database = this.database || new Databases.Model({id: databaseName});
       this.doc = new Documents.Doc({
@@ -39,6 +39,7 @@ function(app, FauxtonAPI, Documents, Databases) {
       });
 
       this.tabsView = this.setView("#tabs", new Documents.Views.FieldEditorTabs({
+        disableLoader: true,
         selected: "code_editor",
         model: this.doc
       }));
@@ -135,7 +136,7 @@ function(app, FauxtonAPI, Documents, Databases) {
 
   var DocumentsRouteObject = FauxtonAPI.RouteObject.extend({
     layout: "with_tabs_sidebar",
-
+    navSelector: '.databases',
     routes: {
       "database/:database/_all_docs(:extra)": "allDocs", 
       "database/:database/_design/:ddoc/_view/:view": {
@@ -173,10 +174,10 @@ function(app, FauxtonAPI, Documents, Databases) {
         database: this.data.database
       }));
 
-      this.setView("#tabs", new Documents.Views.Tabs({
-        collection: this.data.designDocs,
-        database: this.data.database
-      }));
+      // this.setView("#tabs", new Documents.Views.Tabs({
+      //   collection: this.data.designDocs,
+      //   database: this.data.database
+      // }));
     },
 
     establish: function () {
@@ -197,6 +198,9 @@ function(app, FauxtonAPI, Documents, Databases) {
 
       if (this.viewEditor) { this.viewEditor.remove(); }
 
+
+      this.toolsView = this.setView("#dashboard-upper-menu", new Documents.Views.JumpToDoc());
+
       this.documentsView = this.setView("#dashboard-lower-content", new Documents.Views.AllDocsList({
         collection: this.data.database.allDocs
       }));
@@ -237,6 +241,8 @@ function(app, FauxtonAPI, Documents, Databases) {
         ddocInfo: ddocInfo
       }));
 
+      if (this.toolsView) { this.toolsView.remove(); }
+
       this.documentsView = this.setView("#dashboard-lower-content", new Documents.Views.AllDocsList({
         database: this.data.database,
         collection: this.data.indexedDocs,
@@ -269,6 +275,13 @@ function(app, FauxtonAPI, Documents, Databases) {
       }));
 
       this.sidebar.setSelectedTab('new-view');
+      this.crumbs = function () {
+        return [
+          {"name": "Databases", "link": "/_all_dbs"},
+          {"name": this.data.database.id, "link": Databases.databaseUrl(this.data.database)},
+          {"name": "new"}
+        ];
+      };
     },
 
     updateAllDocsFromView: function (event) {
@@ -321,7 +334,7 @@ function(app, FauxtonAPI, Documents, Databases) {
 
   var ChangesRouteObject = FauxtonAPI.RouteObject.extend({
     layout: "with_tabs",
-
+    navSelector: '.databases',
     crumbs: function () {
       return [
         {"name": "Databases", "link": "/_all_dbs"},

http://git-wip-us.apache.org/repos/asf/couchdb/blob/7d376196/src/fauxton/app/modules/documents/views.js
----------------------------------------------------------------------
diff --git a/src/fauxton/app/modules/documents/views.js b/src/fauxton/app/modules/documents/views.js
index 2ef4d41..881f3d1 100644
--- a/src/fauxton/app/modules/documents/views.js
+++ b/src/fauxton/app/modules/documents/views.js
@@ -131,6 +131,8 @@ function(app, FauxtonAPI, Documents, pouchdb, Codemirror, JSHint) {
   Views.UploadModal = FauxtonAPI.View.extend({
     template: "templates/documents/upload_modal",
 
+    disableLoader: true,
+    
     initialize: function (options) {
       _.bindAll(this);
     },
@@ -289,9 +291,7 @@ function(app, FauxtonAPI, Documents, pouchdb, Codemirror, JSHint) {
 
   Views.FieldEditorTabs = FauxtonAPI.View.extend({
     template: "templates/documents/doc_field_editor_tabs",
-
     disableLoader: true,
-
     initialize: function(options) {
       this.selected = options.selected;
     },
@@ -563,11 +563,10 @@ function(app, FauxtonAPI, Documents, pouchdb, Codemirror, JSHint) {
 
   Views.Doc = FauxtonAPI.View.extend({
     template: "templates/documents/doc",
-
     events: {
       "click button.save-doc": "saveDoc"
     },
-
+    disableLoader: true,
     initialize: function (options) {
       this.database = options.database;
     },
@@ -705,7 +704,7 @@ function(app, FauxtonAPI, Documents, pouchdb, Codemirror, JSHint) {
 
   Views.DocFieldEditor = FauxtonAPI.View.extend({
     template: "templates/documents/doc_field_editor",
-
+    disableLoader: true,
     events: {
       "click button.save": "saveDoc"
     },
@@ -1250,11 +1249,24 @@ function(app, FauxtonAPI, Documents, pouchdb, Codemirror, JSHint) {
     }
   });
 
+
+  //moved out of sidebar into it's own view
+  Views.JumpToDoc = FauxtonAPI.View.extend({
+    template: "templates/documents/jumpdoc",
+    events: {
+      "submit #jump-to-doc": "jumpToDoc"
+    },
+    jumpToDoc: function (event) {
+      event.preventDefault();
+      var docId = this.$('#jump-to-doc-id').val();
+      FauxtonAPI.navigate('/database/' + this.database.id +'/' + docId, {trigger: true});
+    }
+  });
+
   Views.Sidebar = FauxtonAPI.View.extend({
     template: "templates/documents/sidebar",
     events: {
-      "click a.new#index": "newIndex",
-      "submit #jump-to-doc": "jumpToDoc"
+      "click a.new#index": "newIndex"
     },
 
     initialize: function(options) {
@@ -1267,6 +1279,8 @@ function(app, FauxtonAPI, Documents, pouchdb, Codemirror, JSHint) {
 
     serialize: function() {
       return {
+        changes_url: '#' + this.database.url('changes'),
+        db_url: '#' + this.database.url('index') + '?limit=100',
         index: [1,2,3],
         view: [1,2],
         database: this.collection.database
@@ -1291,12 +1305,6 @@ function(app, FauxtonAPI, Documents, pouchdb, Codemirror, JSHint) {
       app.router.navigate(url);
     },
 
-    jumpToDoc: function (event) {
-      event.preventDefault();
-      var docId = this.$('#jump-to-doc-id').val();
-      FauxtonAPI.navigate('/database/' + this.database.id +'/' + docId, {trigger: true});
-    },
-
     buildIndexList: function(collection, selector, design){
 
       _.each(_.keys(collection), function(key){

http://git-wip-us.apache.org/repos/asf/couchdb/blob/7d376196/src/fauxton/app/modules/fauxton/base.js
----------------------------------------------------------------------
diff --git a/src/fauxton/app/modules/fauxton/base.js b/src/fauxton/app/modules/fauxton/base.js
index 716e9e7..097e85c 100644
--- a/src/fauxton/app/modules/fauxton/base.js
+++ b/src/fauxton/app/modules/fauxton/base.js
@@ -13,11 +13,12 @@
 define([
        "app",
        // Libs
-       "backbone"
+       "backbone",
+       "windowResize"
 
 ],
 
-function(app, Backbone) {
+function(app, Backbone, WindowResize) {
   var Fauxton = app.module();
 
   Fauxton.Breadcrumbs = Backbone.View.extend({
@@ -61,32 +62,83 @@ function(app, Backbone) {
   });
 
   Fauxton.NavBar = Backbone.View.extend({
+    className:"navbar",
     template: "templates/fauxton/nav_bar",
     // TODO: can we generate this list from the router?
     navLinks: [
-      {href:"#/_all_dbs", title:"Databases"}
+      {href:"#/_all_dbs", title:"Databases", icon: "fonticon-database", className: 'databases'}
     ],
 
+    bottomNavLinks: [],
+
     initialize: function() {
     },
 
     serialize: function() {
-      return {navLinks: this.navLinks};
+      return {navLinks: this.navLinks, bottomNavLinks: this.bottomNavLinks};
     },
 
     addLink: function(link) {
-      if (link.top){
+      // link.top means it gets pushed to the top of the array,
+      // link.bottomNav means it goes to the additional bottom nav
+      if (link.top && !link.bottomNav){
         this.navLinks.unshift(link);
+      } else if (link.top && link.bottomNav){
+        this.bottomNavLinks.unshift(link);
+      } else if (link.bottomNav) {
+        this.bottomNavLinks.push(link);
       } else {
         this.navLinks.push(link);
       }
-      this.trigger("link:add");
 
-      this.render();
+      //this.trigger("link:add");
+
+      //this.render();
+    },
+
+    afterRender: function(){
+
+      $('#primary-navbar li[data-nav-name="' + app.selectedHeader + '"]').addClass('active');
+
+      var menuOpen = true;
+      var $selectorList = $('body');
+      $('.brand').off();
+      $('.brand').on({
+        click: function(e){
+          if(!$(e.target).is('a')){
+            toggleMenu();
+          }
+         }
+      });
+
+      function toggleMenu(){
+        $selectorList.toggleClass('closeMenu');
+        menuOpen = $selectorList.hasClass('closeMenu');
+        setTimeout(
+          function(){
+            app.windowResize.onResizeHandler();
+          }, 1000);
+      }
+
+      $('#primary-navbar').on("click", ".nav a", function(){
+        if (!($selectorList.hasClass('closeMenu'))){
+        setTimeout(
+          function(){
+            $selectorList.addClass('closeMenu');
+          },1000);
+
+        }
+      });
+
+     app.windowResize = new WindowResize({
+          columnType: "double",
+          selectorElements: '#dashboard-content, #dashboard-content .editcase'
+      });
+      app.windowResize.initialize();
     },
 
     beforeRender: function () {
-      this.addLinkViews();
+      //this.addLinkViews();
     },
 
     addLinkViews: function () {

http://git-wip-us.apache.org/repos/asf/couchdb/blob/7d376196/src/fauxton/app/modules/fauxton/layout.js
----------------------------------------------------------------------
diff --git a/src/fauxton/app/modules/fauxton/layout.js b/src/fauxton/app/modules/fauxton/layout.js
index d964b7b..47281e7 100644
--- a/src/fauxton/app/modules/fauxton/layout.js
+++ b/src/fauxton/app/modules/fauxton/layout.js
@@ -30,6 +30,9 @@ function(Backbone) {
       views: {
         "#primary-navbar": this.navBar,
         "#api-navbar": this.apiBar
+      },
+      afterRender: function(){
+
       }
     });
 
@@ -41,7 +44,6 @@ function(Backbone) {
 
   // creatings the dashboard object same way backbone does
   _.extend(Layout.prototype, {
-
     render: function () {
       return this.layout.render();
     },

http://git-wip-us.apache.org/repos/asf/couchdb/blob/7d376196/src/fauxton/app/templates/databases/list.html
----------------------------------------------------------------------
diff --git a/src/fauxton/app/templates/databases/list.html b/src/fauxton/app/templates/databases/list.html
index 808c950..6c4cbbd 100644
--- a/src/fauxton/app/templates/databases/list.html
+++ b/src/fauxton/app/templates/databases/list.html
@@ -13,15 +13,18 @@ the License.
 -->
 
 <div class="result-tools" style="">
+  <div id="newButton" class="pull-left"></div>
   <form class="navbar-form pull-right database-search">
-    <input type="text" class="search-query" placeholder="Search by database name">
+    <label class="fonticon-search">
+      <input type="text" class="search-query" placeholder="Search by database name">
+    </label>
   </form>
 </div>
 <table class="databases table table-striped">
   <thead>
     <th>Name</th>
     <th>Size</th>
-    <th>Number of Documents</th>
+    <th># of Docs</th>
     <th>Update Seq</th>
   </thead>
   <tbody>

http://git-wip-us.apache.org/repos/asf/couchdb/blob/7d376196/src/fauxton/app/templates/databases/newdatabase.html
----------------------------------------------------------------------
diff --git a/src/fauxton/app/templates/databases/newdatabase.html b/src/fauxton/app/templates/databases/newdatabase.html
new file mode 100644
index 0000000..a39cd74
--- /dev/null
+++ b/src/fauxton/app/templates/databases/newdatabase.html
@@ -0,0 +1,17 @@
+<!--
+Licensed under the Apache License, Version 2.0 (the "License"); you may not
+use this file except in compliance with the License. You may obtain a copy of
+the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+License for the specific language governing permissions and limitations under
+the License.
+-->
+
+<a class="button new" id="new"><i class="icon fonticon-new-database"></i>Add new database</a>
+
+

http://git-wip-us.apache.org/repos/asf/couchdb/blob/7d376196/src/fauxton/app/templates/documents/all_docs_list.html
----------------------------------------------------------------------
diff --git a/src/fauxton/app/templates/documents/all_docs_list.html b/src/fauxton/app/templates/documents/all_docs_list.html
index c0a0d40..fd1a5b0 100644
--- a/src/fauxton/app/templates/documents/all_docs_list.html
+++ b/src/fauxton/app/templates/documents/all_docs_list.html
@@ -27,7 +27,6 @@ the License.
       -->
     </div>
   <% } %>
-
   <p>
     Showing 1-<%= numModels %> of <%= totalRows %> rows
     <% if (updateSeq) { %>

http://git-wip-us.apache.org/repos/asf/couchdb/blob/7d376196/src/fauxton/app/templates/documents/doc.html
----------------------------------------------------------------------
diff --git a/src/fauxton/app/templates/documents/doc.html b/src/fauxton/app/templates/documents/doc.html
index 6cca488..92c29ff 100644
--- a/src/fauxton/app/templates/documents/doc.html
+++ b/src/fauxton/app/templates/documents/doc.html
@@ -35,7 +35,7 @@ the License.
   <textarea class="doc-code"><%= JSON.stringify(doc.attributes, null, "  ") %></textarea>
   <br />
   <p>
-    <button class="save-doc btn btn-large btn-primary" type="button">Save</button>
+    <button class="save-doc button" type="button">Save</button>
   </p>
 
 </div>

http://git-wip-us.apache.org/repos/asf/couchdb/blob/7d376196/src/fauxton/app/templates/documents/edit_tools.html
----------------------------------------------------------------------
diff --git a/src/fauxton/app/templates/documents/edit_tools.html b/src/fauxton/app/templates/documents/edit_tools.html
new file mode 100644
index 0000000..40c884d
--- /dev/null
+++ b/src/fauxton/app/templates/documents/edit_tools.html
@@ -0,0 +1,44 @@
+<!--
+Licensed under the Apache License, Version 2.0 (the "License"); you may not
+use this file except in compliance with the License. You may obtain a copy of
+the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+License for the specific language governing permissions and limitations under
+the License.
+-->
+
+<div class="view show">
+  <p>
+    Showing 1-<%= numModels %> of <%= totalRows %> rows
+    <% if (updateSeq) { %>
+      -- Update Sequence: <%= updateSeq %>
+    <% } %>
+    <% if (requestDuration) { %>
+  <span class="view-request-duration">
+    View request duration: <strong> <%= requestDuration %> </strong> 
+   </span>
+   <% } %>
+  </p>
+  <table class="all-docs table table-striped table-condensed">
+    <tbody></tbody>
+  </table>
+  <!--
+  <div class="pagination pagination-centered">
+    <ul>
+      <li class="disabled"><a href="#">&laquo;</a></li>
+      <li class="active"><a href="#">1</a></li>
+      <li><a href="#">2</a></li>
+      <li><a href="#">3</a></li>
+      <li><a href="#">4</a></li>
+      <li><a href="#">5</a></li>
+      <li><a href="#">&raquo;</a></li>
+    </ul>
+  </div>
+  -->
+
+</div>

http://git-wip-us.apache.org/repos/asf/couchdb/blob/7d376196/src/fauxton/app/templates/documents/jumpdoc.html
----------------------------------------------------------------------
diff --git a/src/fauxton/app/templates/documents/jumpdoc.html b/src/fauxton/app/templates/documents/jumpdoc.html
new file mode 100644
index 0000000..d95e6aa
--- /dev/null
+++ b/src/fauxton/app/templates/documents/jumpdoc.html
@@ -0,0 +1,20 @@
+<!--
+Licensed under the Apache License, Version 2.0 (the "License"); you may not
+use this file except in compliance with the License. You may obtain a copy of
+the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+License for the specific language governing permissions and limitations under
+the License.
+-->
+
+
+<form id="jump-to-doc" class="form-inline">
+	<label class="fonticon-search">
+    <input type="text" id="jump-to-doc-id" class="input-large" placeholder="Document ID"></input>
+  </label>
+</form>

http://git-wip-us.apache.org/repos/asf/couchdb/blob/7d376196/src/fauxton/app/templates/documents/sidebar.html
----------------------------------------------------------------------
diff --git a/src/fauxton/app/templates/documents/sidebar.html b/src/fauxton/app/templates/documents/sidebar.html
index df75311..d691b9a 100644
--- a/src/fauxton/app/templates/documents/sidebar.html
+++ b/src/fauxton/app/templates/documents/sidebar.html
@@ -13,29 +13,53 @@ the License.
 -->
 
 <div id="sidenav">
-  <div class="row-fluid">
-    <div class="span4">
-      <a class="btn btn-small new" id="doc" href="#<%= database.url('app') %>/new"><i class="icon-file"></i> New doc</a>
-      <div class="btn-group" id="new-index">
-        <a class="btn btn-small" href="#<%= database.url('app') %>/new_view">New view</a>
+  <header class="row-fluid">
+    <div class="span5">
+      <div class="btn-group">
+        <button class="btn">Docs</button>
+        <button class="btn dropdown-toggle" data-toggle="dropdown">
+          <span class="caret"></span>
+        </button>
+        <ul class="dropdown-menu">
+          <!-- dropdown menu links -->
+          <li><a href="<%= db_url %>">Docs</a></li>
+          <!-- TODO::REENABLE
+          <li><a href="#">Permissions</a></li>
+          <li><a href="#">Stats</a></li>
+          -->
+          <li><a  href="<%= changes_url %>">Changes</a></li>
+        </ul>
       </div>
     </div>
-    <div class="span6">
-      <form id="jump-to-doc" class="form-inline">
-        <label> Jump To: 
-          <input type="text" id="jump-to-doc-id" class="input-small" placeholder="Document Id"></input>
-        </label>
-      </form>
+
+    <div class="span5 offset1">
+      <div class="btn-group">
+        <button class="btn">Add</button>
+        <button class="btn dropdown-toggle" data-toggle="dropdown">
+          <span class="caret"></span>
+        </button>
+        <ul class="dropdown-menu">
+          <!-- dropdown menu links -->
+           <li>
+            <a id="doc" href="#<%= database.url('app') %>/new">New doc</a>
+          </li>
+          <li>
+            <a href="#<%= database.url('app') %>/new_view">New view</a>
+          </li>
+        </ul>
+      </div>
     </div>
-  </div>
+  </header>
 
-  <hr>
-  <ul class="nav nav-list">
-    <li class="active"><a id="all-docs" href="#<%= database.url('index') %>?limit=100" class="toggle-view"><i class="icon-list"></i> All documents</a></li>
-    <li><a id="design-docs" href='#<%= database.url("index") %>?limit=100&startkey="_design"&endkey="_e"'  class="toggle-view"><i class="icon-list"></i> All design docs</a></li>
-  </ul>
-  <ul class="nav nav-list views">
-    <li class="nav-header">Secondary Indexes</li>
-    <li><a id="new-view" href="#<%= database.url('app') %>/new_view" class="new"><i class="icon-plus"></i> New</a></li>
-  </ul>
+  <nav>
+    <ul class="nav nav-list">
+      <li class="nav-header">Primary Indices</li>
+      <li class="active"><a id="all-docs" href="#<%= database.url('index') %>?limit=100" class="toggle-view"><i class="icon-list"></i> All documents</a></li>
+      <li><a id="design-docs" href='#<%= database.url("index") %>?limit=100&startkey="_design"&endkey="_e"'  class="toggle-view"><i class="icon-list"></i> All design docs</a></li>
+    </ul>
+    <ul class="nav nav-list views">
+      <li class="nav-header">Secondary Indices</li>
+      <li><a id="new-view" href="#<%= database.url('app') %>/new_view" class="new"><i class="icon-plus"></i> New</a></li>
+    </ul>
+  </nav>
 </div>

http://git-wip-us.apache.org/repos/asf/couchdb/blob/7d376196/src/fauxton/app/templates/documents/view_editor.html
----------------------------------------------------------------------
diff --git a/src/fauxton/app/templates/documents/view_editor.html b/src/fauxton/app/templates/documents/view_editor.html
index 32f1d14..ed61903 100644
--- a/src/fauxton/app/templates/documents/view_editor.html
+++ b/src/fauxton/app/templates/documents/view_editor.html
@@ -98,11 +98,11 @@ the License.
                 <div class="control-group">
                   <hr />
                   <div class="controls">
+                    <button class="btn btn-success save">Save</button>
+                    <button class="btn btn-small btn-info preview">Preview</button>
                     <% if (!this.newView) { %>
                     <button class="btn btn-small btn-danger delete">Delete</button>
                     <% } %>
-                    <button class="btn btn-small btn-info preview">Preview</button>
-                    <button class="btn btn-primary save">Save</button>
                   </div>
                 </div>
                 <div class="clearfix"></div>

http://git-wip-us.apache.org/repos/asf/couchdb/blob/7d376196/src/fauxton/app/templates/fauxton/breadcrumbs.html
----------------------------------------------------------------------
diff --git a/src/fauxton/app/templates/fauxton/breadcrumbs.html b/src/fauxton/app/templates/fauxton/breadcrumbs.html
index 489fef3..026db89 100644
--- a/src/fauxton/app/templates/fauxton/breadcrumbs.html
+++ b/src/fauxton/app/templates/fauxton/breadcrumbs.html
@@ -16,7 +16,7 @@ the License.
   <% _.each(_.initial(crumbs), function(crumb) { %>
     <li>
       <a href="#<%= crumb.link %>"><%= crumb.name %></a>
-      <span class="divider"> / </span>
+      <span class="divider fonticon fonticon-carrot"> </span>
     </li>
   <% }); %>
   <% var last = _.last(crumbs) || {name: ''} %>

http://git-wip-us.apache.org/repos/asf/couchdb/blob/7d376196/src/fauxton/app/templates/fauxton/nav_bar.html
----------------------------------------------------------------------
diff --git a/src/fauxton/app/templates/fauxton/nav_bar.html b/src/fauxton/app/templates/fauxton/nav_bar.html
index 75731e0..2c4184c 100644
--- a/src/fauxton/app/templates/fauxton/nav_bar.html
+++ b/src/fauxton/app/templates/fauxton/nav_bar.html
@@ -12,24 +12,26 @@ License for the specific language governing permissions and limitations under
 the License.
 -->
 
-<div class="navbar navbar-inverse navbar-fixed-top">
-  <div class="navbar-inner">
-    <div class="container">
-      <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
-        <span class="icon-bar"></span>
-        <span class="icon-bar"></span>
-        <span class="icon-bar"></span>
-      </a>
-      <a class="brand" href="#">Project Fauxton</a>
-      <div class="nav-collapse">
-        <ul id="nav-links" class="nav pull-right">
-          <% _.each(navLinks, function(link) { %>
-            <% if (!link.view) { %>
-            <li data-nav-name= "<%= link.title %>" ><a href="<%= link.href %>"><%= link.title %></a></li>
-            <% } %>
-          <% }); %>
-        </ul>
-      </div><!--/.nav-collapse -->
-    </div>
-  </div>
-</div>
+<a class="brand" href="#"><div class="icon">Apache Fauxton</div></a>
+<nav id="main_navigation">
+  <ul id="nav-links" class="nav pull-right">
+    <% _.each(navLinks, function(link) { %>
+      <% if (!link.view) { %>
+        <li data-nav-name= "<%= link.title %>" ><a class="<%= link.icon %> fonticon" href="<%= link.href %>"><%= link.title %></a></li>
+      <% } %>
+    <% }); %>
+  </ul>
+
+    <ul id="bottom-nav-links" class="nav">
+    <% _.each(bottomNavLinks, function(link) { %>
+      <li data-nav-name= "<%= link.title %>">
+          <a class="<%= link.icon %> fonticon" href="<%= link.href %>">
+              <%= link.title %>
+          </a>
+      </li>
+    <% }); %>
+  </ul>
+</nav>
+
+
+

http://git-wip-us.apache.org/repos/asf/couchdb/blob/7d376196/src/fauxton/app/templates/layouts/one_pane.html
----------------------------------------------------------------------
diff --git a/src/fauxton/app/templates/layouts/one_pane.html b/src/fauxton/app/templates/layouts/one_pane.html
index 71c38fb..1f85261 100644
--- a/src/fauxton/app/templates/layouts/one_pane.html
+++ b/src/fauxton/app/templates/layouts/one_pane.html
@@ -13,16 +13,15 @@ the License.
 -->
 
 <div id="primary-navbar"></div>
-
-<div id="dashboard" class="container">
-  <div class="row">
+<div id="dashboard" class="container-fluid one-pane">
+  <div class="row-fluid fixed-header">
     <div id="breadcrumbs" class="span12"></div>
   </div>
-  <div id="tabs" class="row"></div>
 
-  <div class="row">
-    <div id="dashboard-content" class="list span12"></div>
+
+  <div class="row-fluid content-area">
+  	<div id="tabs" class="row"></div>
+    <div id="dashboard-content"></div>
   </div>
 </div>
-
 <div id="api-navbar"></div>

http://git-wip-us.apache.org/repos/asf/couchdb/blob/7d376196/src/fauxton/app/templates/layouts/two_pane.html
----------------------------------------------------------------------
diff --git a/src/fauxton/app/templates/layouts/two_pane.html b/src/fauxton/app/templates/layouts/two_pane.html
index e8b8411..d2397c5 100644
--- a/src/fauxton/app/templates/layouts/two_pane.html
+++ b/src/fauxton/app/templates/layouts/two_pane.html
@@ -12,18 +12,18 @@ License for the specific language governing permissions and limitations under
 the License.
 -->
 
-<div id="primary-navbar"></div>
 
-<div id="dashboard" class="container">
-  <div class="row">
+<div id="primary-navbar"></div>
+<div id="dashboard" class="container-fluid">
+  <div class="row-fluid fixed-header">
     <div id="breadcrumbs" class="span12"></div>
   </div>
-  <div id="tabs" class="row"></div>
 
-  <div class="row">
+
+  <div class="row-fluid content-area">
+  	<div id="tabs" class="row"></div>
     <div id="left-content" class="span6"></div>
     <div id="right-content" class="span6"></div>
   </div>
 </div>
-
 <div id="api-navbar"></div>

http://git-wip-us.apache.org/repos/asf/couchdb/blob/7d376196/src/fauxton/app/templates/layouts/with_right_sidebar.html
----------------------------------------------------------------------
diff --git a/src/fauxton/app/templates/layouts/with_right_sidebar.html b/src/fauxton/app/templates/layouts/with_right_sidebar.html
index 06623c4..208766d 100644
--- a/src/fauxton/app/templates/layouts/with_right_sidebar.html
+++ b/src/fauxton/app/templates/layouts/with_right_sidebar.html
@@ -13,14 +13,13 @@ the License.
 -->
 
 <div id="primary-navbar"></div>
-
-<div id="dashboard" class="container">
-  <div class="row">
+<div id="dashboard" class="container-fluid">
+  <div class="row-fluid fixed-header">
     <div id="breadcrumbs" class="span12"></div>
   </div>
-  <div class="row">
-    <div id="dashboard-content" class="list span8"></div>
-    <div id="sidebar-content" class="sidebar span4 pull-right"></div>
+  <div class="with-sidebar-right content-area">
+    <div id="dashboard-content" class="list"></div>
+    <div id="sidebar-content" class="sidebar pull-right"></div>
   </div>
 </div>
 

http://git-wip-us.apache.org/repos/asf/couchdb/blob/7d376196/src/fauxton/app/templates/layouts/with_sidebar.html
----------------------------------------------------------------------
diff --git a/src/fauxton/app/templates/layouts/with_sidebar.html b/src/fauxton/app/templates/layouts/with_sidebar.html
index 5deb4d1..c534c61 100644
--- a/src/fauxton/app/templates/layouts/with_sidebar.html
+++ b/src/fauxton/app/templates/layouts/with_sidebar.html
@@ -12,16 +12,16 @@ License for the specific language governing permissions and limitations under
 the License.
 -->
 
-<div id="primary-navbar"></div>
 
+<div id="primary-navbar"></div>
 <div id="dashboard" class="container-fluid">
-  <div class="row-fluid">
-    <div id="breadcrumbs" class="span12"></div>
-  </div>
-  <div class="row-fluid">
-    <div id="sidebar-content" class="sidebar span3"></div>
-    <div id="dashboard-content" class="list span9"></div>
+<header class="row-fluid fixed-header">
+  <div id="breadcrumbs" class="row-fluid"></div>
+  <div id="api-navbar"></div>
+</header>
+  <div class="with-sidebar content-area">
+    <div id="sidebar-content" class="sidebar"></div>
+    <div id="dashboard-content" class="list"></div>
   </div>
 </div>
 
-<div id="api-navbar"></div>

http://git-wip-us.apache.org/repos/asf/couchdb/blob/7d376196/src/fauxton/app/templates/layouts/with_tabs.html
----------------------------------------------------------------------
diff --git a/src/fauxton/app/templates/layouts/with_tabs.html b/src/fauxton/app/templates/layouts/with_tabs.html
index 36b39c8..33cf0f5 100644
--- a/src/fauxton/app/templates/layouts/with_tabs.html
+++ b/src/fauxton/app/templates/layouts/with_tabs.html
@@ -15,13 +15,13 @@ the License.
 <div id="primary-navbar"></div>
 <div id="dashboard" class="container-fluid">
 
-<div class="row-fluid">
+<div class="row-fluid fixed-header">
   <div id="breadcrumbs" class="row-fluid"></div>
-  <div id="tabs" class="row-fluid"></div>
+</div>
 
-  <div class="row-fluid">
+  <div class="row-fluid content-area">
+  	<div id="tabs" class="row-fluid"></div>
     <div id="dashboard-content" class="list span12"></div>
   </div>
-</div>
 
 <div id="api-navbar"></div>

http://git-wip-us.apache.org/repos/asf/couchdb/blob/7d376196/src/fauxton/app/templates/layouts/with_tabs_sidebar.html
----------------------------------------------------------------------
diff --git a/src/fauxton/app/templates/layouts/with_tabs_sidebar.html b/src/fauxton/app/templates/layouts/with_tabs_sidebar.html
index 0b5f2c7..be65c0c 100644
--- a/src/fauxton/app/templates/layouts/with_tabs_sidebar.html
+++ b/src/fauxton/app/templates/layouts/with_tabs_sidebar.html
@@ -15,17 +15,27 @@ the License.
 <div id="primary-navbar"></div>
 <div id="dashboard" class="container-fluid">
 
-<div class="row-fluid">
+<header class="row-fluid fixed-header">
   <div id="breadcrumbs" class="row-fluid"></div>
-  <div id="tabs" class="row-fluid"></div>
-
-  <div class="row-fluid">
-    <div id="sidebar-content" class="sidebar span4"></div>
-    <div id="dashboard-content" class="list span8 pull-right">
-      <div id="dashboard-upper-content"></div>
-      <div id="dashboard-lower-content"></div>
-    </div>
+  <div id="api-navbar"></div>
+</header>
+
+
+  <div class="with-sidebar content-area">
+
+    <div id="tabs" class="row-fluid"></div>
+
+    <aside id="sidebar-content" class="sidebar"></aside>
+
+    <section id="dashboard-content" class="list pull-right">
+      <div class="inner">
+        <div id="dashboard-upper-menu"></div>
+        <div id="dashboard-upper-content"></div>
+
+        <div id="dashboard-lower-content"></div>
+      </div>
+    </section>
+
   </div>
-</div>
 
-<div id="api-navbar"></div>
+

http://git-wip-us.apache.org/repos/asf/couchdb/blob/7d376196/src/fauxton/app/windowResize.js
----------------------------------------------------------------------
diff --git a/src/fauxton/app/windowResize.js b/src/fauxton/app/windowResize.js
new file mode 100644
index 0000000..1a1efe4
--- /dev/null
+++ b/src/fauxton/app/windowResize.js
@@ -0,0 +1,41 @@
+define([
+],
+
+function() {
+
+  var Resize = function(options){
+    this.options = options;
+    this.options.selectorElements = options.selectorElements || "#dashboard-content";
+  };
+
+  Resize.prototype = {
+    getPanelWidth: function(){
+      var sidebarWidth = $('#sidebar-content').length > 0?$('#sidebar-content').width(): 40,
+          primeNavWidth = parseInt($('#dashboard').css('left').replace('px',''),10);
+      return (primeNavWidth +sidebarWidth); 
+    },
+    initialize: function(){
+      $(window).off('resize');
+      var that = this;
+      //add throttler :) 
+      this.lazyLayout = _.debounce(that.onResizeHandler, 300).bind(this);
+      $(window).on('resize', this.lazyLayout);
+      this.onResizeHandler();
+    },
+    onResizeHandler: function (){
+      //if there is an override, do that instead
+      if (this.options.onResizeHandler){
+        this.options.onResizeHandler();
+      } else {
+        var panelWidth = (window.innerWidth - this.getPanelWidth() < 1100) ? window.innerWidth - this.getPanelWidth() :1100;
+        $(this.options.selectorElements).width(panelWidth);
+      }
+      //if there is a callback, run that
+      if(this.options.callback) {
+        this.options.callback();
+      }
+    } 
+  };
+
+  return Resize;
+});

http://git-wip-us.apache.org/repos/asf/couchdb/blob/7d376196/src/fauxton/assets/img/fontcustom_fauxton.eot
----------------------------------------------------------------------
diff --git a/src/fauxton/assets/img/fontcustom_fauxton.eot b/src/fauxton/assets/img/fontcustom_fauxton.eot
new file mode 100644
index 0000000..48ed90d
Binary files /dev/null and b/src/fauxton/assets/img/fontcustom_fauxton.eot differ

http://git-wip-us.apache.org/repos/asf/couchdb/blob/7d376196/src/fauxton/assets/img/fontcustom_fauxton.svg
----------------------------------------------------------------------
diff --git a/src/fauxton/assets/img/fontcustom_fauxton.svg b/src/fauxton/assets/img/fontcustom_fauxton.svg
new file mode 100644
index 0000000..79459f3
--- /dev/null
+++ b/src/fauxton/assets/img/fontcustom_fauxton.svg
@@ -0,0 +1,200 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
+<!--
+2013-7-2: Created.
+-->
+<svg xmlns="http://www.w3.org/2000/svg">
+<metadata>
+Created by FontForge 20120731 at Tue Jul  2 15:07:12 2013
+ By Sue Lockwood
+Created by Sue Lockwood with FontForge 2.0 (http://fontforge.sf.net)
+</metadata>
+<defs>
+<font id="fontcustom_fauxton" horiz-adv-x="512" >
+  <font-face 
+    font-family="fontcustom_fauxton"
+    font-weight="500"
+    font-stretch="normal"
+    units-per-em="512"
+    panose-1="2 0 6 9 0 0 0 0 0 0"
+    ascent="448"
+    descent="-64"
+    bbox="0 -63.7441 512.201 448"
+    underline-thickness="25.6"
+    underline-position="-51.2"
+    unicode-range="U+F100-F125"
+  />
+    <missing-glyph />
+    <glyph glyph-name="uniF100" unicode="&#xf100;" 
+d="M2.43164 128.608v142.632h507.137v-142.632h-507.137zM2.43164 81.0635h507.137v-142.632h-507.137v142.632zM493.72 -45.7197v110.936h-95.0879v-110.936h95.0879zM2.43164 445.568h507.137v-110.937h-507.137v110.937zM493.72 350.479v79.2402h-253.567v-79.2402
+h253.567z" />
+    <glyph glyph-name="uniF101" unicode="&#xf101;" 
+d="M478.972 2.39355c-48.708 -2.12891 -141.553 -10.46 -191.938 -36.6318c-2.37891 -15.2148 -14.9824 -27.0264 -30.8662 -27.0264c-15.8828 0 -28.4561 11.8115 -30.8652 27.0264c-50.3545 26.1719 -143.23 34.5029 -191.938 36.6318
+c-17.5615 0 -31.8291 14.2354 -31.8291 31.8281v381.949c0 17.5625 14.2676 31.8291 31.8291 31.8291c1.11914 0 2.03613 -0.543945 3.1543 -0.637695c218.887 -5.6416 219.648 -63.0205 219.648 -63.0205s0.761719 57.3789 219.648 63.0205
+c1.11914 0.09375 2.03613 0.637695 3.15527 0.637695c17.5928 0 31.8291 -14.2666 31.8291 -31.8291v-381.949c0 -17.5928 -14.2363 -31.8281 -31.8291 -31.8281zM224.34 348.254c-41.0615 20.8721 -108.978 29.5605 -159.146 33.2598v-317.202
+c85.4316 -4.32129 133.237 -17.127 159.146 -30.0898v314.032zM447.143 381.514c-50.1689 -3.69922 -118.085 -12.3877 -159.146 -33.2598v-314.032c25.9082 12.9316 73.7139 25.7539 159.146 30.0898v317.202zM415.312 320.684v-63.6582s-95.4863 0 -95.4863 -31.8291
+v63.6592s0 31.8281 95.4863 31.8281zM415.312 193.367v-63.6582s-95.4863 0 -95.4863 -31.8291v63.6582s0 31.8291 95.4863 31.8291zM192.511 288.855v-63.6592c0 31.8291 -95.4873 31.8291 -95.4873 31.8291v63.6582c95.4873 0 95.4873 -31.8281 95.4873 -31.8281z
+M192.511 161.538v-63.6582c0 31.8291 -95.4873 31.8291 -95.4873 31.8291v63.6582c95.4873 0 95.4873 -31.8291 95.4873 -31.8291z" />
+    <glyph glyph-name="uniF102" unicode="&#xf102;" 
+d="M167.89 -63.2324l-79.3857 79.7764l175.472 175.456l-175.472 175.472l79.8535 79.7607l255.139 -255.232z" />
+    <glyph glyph-name="uniF103" unicode="&#xf103;" 
+d="M255.092 446.464c140.025 0 253.556 -113.531 253.556 -253.556c0 -140.025 -113.546 -253.556 -253.556 -253.556c-140.024 0 -253.556 113.53 -253.556 253.556c0 140.024 113.546 253.556 253.556 253.556zM215.807 75.9111l197.201 197.215l-44.8184 44.8184
+l-152.397 -152.396l-71.8398 71.8604l-44.8096 -44.8174z" />
+    <glyph glyph-name="uniF104" unicode="&#xf104;" 
+d="M256.512 447.488c140.81 0 254.977 -114.166 254.977 -254.977c0 -140.81 -114.167 -254.976 -254.977 -254.976s-254.976 114.166 -254.976 254.976c0 140.811 114.166 254.977 254.976 254.977zM384 160.64v63.7441h-254.976v-63.7441h254.976z" />
+    <glyph glyph-name="uniF105" unicode="&#xf105;" 
+d="M256.195 446.464c140.635 0 254.659 -114.024 254.659 -254.659c0 -140.634 -114.024 -254.659 -254.659 -254.659s-254.659 114.025 -254.659 254.659c0 140.635 114.024 254.659 254.659 254.659zM383.524 159.973v63.6641h-95.498v95.498h-63.6641v-95.498h-95.4971
+v-63.6641h95.4971v-95.4961h63.665v95.4961h95.4971z" />
+    <glyph glyph-name="uniF106" unicode="&#xf106;" 
+d="M256.423 446.808c140.62 0 254.632 -114.012 254.632 -254.631c0 -140.618 -114.013 -254.631 -254.632 -254.631s-254.631 114.013 -254.631 254.631c0 140.619 114.012 254.631 254.631 254.631zM382.371 111.237l-80.9395 80.9395l80.9395 80.9404l-45.0078 45.0078
+l-80.9404 -80.9404l-80.9395 80.9404l-45.0088 -45.0078l80.9404 -80.9404l-80.9404 -80.9395l45.0088 -45.0078l80.9395 80.9395l80.9404 -80.9395z" />
+    <glyph glyph-name="uniF107" unicode="&#xf107;" 
+d="M511.744 160.645l-76.5098 -32.6094c-2.1084 -5.93457 -4.29395 -11.7754 -7.01172 -17.4912l31.5156 -76.3369l-45.2275 -45.2275l-76.7109 30.7344c-5.71582 -2.74805 -11.7129 -5.12207 -17.8037 -7.37109l-31.6406 -76.0869h-63.9678l-32.3594 75.7119
+c-6.37109 2.18652 -12.5557 4.49805 -18.6152 7.37109l-75.5244 -31.1094l-45.2275 45.2275l30.4219 75.8369c-2.99805 6.18457 -5.49609 12.4941 -7.80859 18.9912l-75.2744 31.3584v63.9688l75.2119 32.1709c2.31152 6.49609 4.74805 12.8066 7.74609 18.9902
+l-30.9844 75.3369l45.2275 45.2285l76.0244 -30.5469c6.05957 2.87305 12.1816 5.24707 18.5537 7.49609l31.6084 75.7119h63.9678l32.4219 -75.9619c6.12207 -2.18652 12.0566 -4.56055 17.8662 -7.37109l76.1494 31.3584l45.2588 -45.2266l-30.8906 -76.8369
+c2.74805 -5.7002 4.99707 -11.4941 7.12109 -17.4912l76.4619 -31.8584v-63.9678zM255.372 96.1758c52.9736 0 95.9521 42.9785 95.9521 95.9521c0 52.9746 -42.9785 95.9521 -95.9521 95.9521c-52.957 0 -95.9512 -42.9775 -95.9512 -95.9521
+c0 -52.9736 42.9932 -95.9521 95.9512 -95.9521z" />
+    <glyph glyph-name="uniF108" unicode="&#xf108;" 
+d="M256 235.195l228.377 -228.377l-68.6074 -68.6074l-159.77 159.769l-159.769 -159.769l-68.6074 68.6074zM256 445.44l228.377 -228.377l-68.6074 -68.6064l-159.77 159.768l-159.769 -159.768l-68.6074 68.6064z" />
+    <glyph glyph-name="uniF109" unicode="&#xf109;" 
+d="M512.201 -7.39062c0 -30.1455 -24.4502 -54.5957 -54.5977 -54.5957h-400.792c-30.1465 0 -54.5967 24.4502 -54.5967 54.5957v400.794c0 30.1455 24.4502 54.5967 54.5967 54.5967h400.792c30.1475 0 54.5977 -24.4512 54.5977 -54.5967v-400.794zM464.39 398.437
+c0 0.972656 -0.77832 1.75098 -1.74316 1.75098h-410.886c-0.956055 0 -1.73438 -0.77832 -1.73438 -1.75098v-410.869c0 -0.949219 0.77832 -1.74219 1.73438 -1.74219h410.886c0.96582 0 1.74316 0.792969 1.74316 1.74219v410.869zM100.945 76.1318l-38.9082 27.7959
+l96.0889 134.525l61.5615 -61.5635l65.6777 114.922l64.667 -80.8213l61.7871 98.8906l40.5586 -25.3213l-97.583 -156.103l-62.8301 78.5498l-61.8027 -108.199l-65.9346 65.9277z" />
+    <glyph glyph-name="uniF10A" unicode="&#xf10a;" 
+d="M250.592 -61.5244c-105.291 0 -190.688 42.6758 -190.688 95.3447v0v53.6611c0 -52.7305 85.4121 -85.4424 190.688 -85.4424c105.291 0 190.688 32.7119 190.688 85.4424v-53.6621v0c0 -52.668 -85.3818 -95.3438 -190.688 -95.3438zM250.592 33.8203
+c-105.291 0 -190.688 42.6748 -190.688 95.3438v53.6465c0 -52.6846 85.4121 -85.4287 190.688 -85.4287c105.291 0 190.688 32.7441 190.688 85.4287v-53.6465c0 -52.6689 -85.3818 -95.3438 -190.688 -95.3438zM250.592 129.164
+c-105.291 0 -190.688 42.6738 -190.688 95.3428v53.6475c0 -52.6846 85.4121 -85.4287 190.688 -85.4287c105.291 0 190.688 32.7432 190.688 85.4287v-53.6475c0 -52.6689 -85.3818 -95.3428 -190.688 -95.3428zM250.592 224.507
+c-105.275 0 -190.688 42.6748 -190.688 95.3438v31.7812c0 52.6689 85.3965 95.3438 190.688 95.3438s190.688 -42.6748 190.688 -95.3438v-31.7812c0 -52.6689 -85.3818 -95.3438 -190.688 -95.3438z" />
+    <glyph glyph-name="uniF10B" unicode="&#xf10b;" 
+d="M287.851 446.805l159.253 -159.222v-350.389h-382.207v509.61h222.954zM128.598 0.895508h254.805v254.806h-127.402v127.402h-127.402v-382.208z" />
+    <glyph glyph-name="uniF10C" unicode="&#xf10c;" 
+d="M335.36 446.976l158.72 -158.688v-253.983h-95.2324v-95.2314h-380.928v412.672h95.2324v95.2314h222.208zM335.36 2.55957v31.7441h-222.208v253.952h-31.7441v-285.696h253.952zM430.592 97.792v158.72h-126.976v126.977h-126.977v-285.696h253.952z" />
+    <glyph glyph-name="uniF10D" unicode="&#xf10d;" 
+d="M256 148.513l-228.994 228.995l68.793 68.793l160.201 -160.185l160.201 160.185l68.793 -68.793zM256 -62.3008l-228.994 228.993l68.793 68.7949l160.201 -160.201l160.201 160.201l68.793 -68.7949z" />
+    <glyph glyph-name="uniF10E" unicode="&#xf10e;" 
+d="M256.342 382.728c140.621 0 254.634 -188.489 254.634 -188.489s-114.013 -193.463 -254.634 -193.463s-254.635 193.463 -254.635 193.463s114.014 188.489 254.635 188.489zM256.342 64.4346c70.3105 0 127.317 57.0068 127.317 127.317
+s-57.0068 127.317 -127.317 127.317s-127.317 -57.0068 -127.317 -127.317s57.0068 -127.317 127.317 -127.317zM256.342 255.161c35.1553 0 63.6582 -28.5029 63.6582 -63.6582s-28.5029 -63.6582 -63.6582 -63.6582s-63.6592 28.5029 -63.6592 63.6582
+s28.5039 63.6582 63.6592 63.6582z" />
+    <glyph glyph-name="uniF10F" unicode="&#xf10f;" 
+d="M351.439 381.472c-52.2754 0 -94.7998 -42.5244 -94.7988 -94.8008c0 -4.9375 0.586914 -10.3701 1.85156 -17.1582l6.04785 -32.7119l-23.5146 -23.5137l-173.985 -173.985v-37.0312h63.2002v63.2002h63.1992v63.2002h63.2002v26.1689l18.5156 18.5156l2.90039 2.90137
+l23.5146 23.5146l32.7109 -6.04785c6.79004 -1.23438 12.2207 -1.85254 17.1582 -1.85254c52.2764 0 94.7998 42.5254 94.7998 94.8008s-42.5234 94.7998 -94.7998 94.7998zM351.439 444.672v0c87.2705 0 158.001 -70.7305 158.001 -158s-70.7305 -158 -158 -158
+c-9.875 0 -19.3799 1.17285 -28.6992 2.90039l-2.90137 -2.90039v-63.2002h-63.2002v-63.1992h-63.2002v-63.2002h-189.6v126.399l192.5 192.501c-1.72754 9.31934 -2.90039 18.8242 -2.90039 28.6992c0 87.2705 70.7305 158 158 158zM351.563 318.272
+c17.4658 0 31.6006 -14.1494 31.6006 -31.6006s-14.1338 -31.6006 -31.6006 -31.6006c-17.4512 0 -31.6006 14.1494 -31.6006 31.6006s14.1494 31.6006 31.6006 31.6006z" />
+    <glyph glyph-name="uniF110" unicode="&#xf110;" 
+d="M481.194 238.603l-46.6826 -46.6377c-29.1152 -29.0996 -72.3096 -34.9346 -107.445 -18.2158l107.445 107.499c12.3496 12.3418 12.3496 32.3262 0 44.6377l-44.6152 44.6914c-12.3193 12.3506 -32.2637 12.3506 -44.6143 0l-107.482 -107.507
+c-16.7266 35.1504 -10.8916 78.376 18.208 107.507l46.6055 46.6377c36.9883 36.957 96.9482 36.957 133.874 0l44.707 -44.6465c36.9268 -37.0039 36.9268 -96.9785 0 -133.966zM166.726 102.736c-12.3271 12.3496 -12.3271 32.2959 0 44.6299l133.912 133.913
+c12.3496 12.3496 32.2959 12.3496 44.6455 0c12.3496 -12.3428 12.3496 -32.2803 0 -44.6221l-133.913 -133.921c-12.3193 -12.3506 -32.3184 -12.3506 -44.6445 0zM77.4424 58.0596l44.6377 -44.6143c12.3496 -12.3496 32.3027 -12.3496 44.6289 0l107.53 107.508
+c16.75 -35.168 10.8682 -78.377 -18.2158 -107.508l-42.6768 -46.6367c-36.9961 -36.9883 -96.9395 -36.9883 -133.943 0l-48.6133 48.582c-36.957 36.9883 -36.957 96.9473 0 133.937l46.6211 42.6689c29.1621 29.0996 72.3555 34.9346 107.553 18.209l-107.521 -107.469
+c-12.3115 -12.3506 -12.3115 -32.3574 0 -44.6768z" />
+    <glyph glyph-name="uniF111" unicode="&#xf111;" 
+d="M510.208 382.88h-508.672v63.584h508.672v-63.584zM319.456 255.712h-317.92v63.584h317.92v-63.584zM510.208 64.96h-508.672v63.584h508.672v-63.584zM383.04 -62.208h-381.504v63.584h381.504v-63.584zM510.208 -30.416c0 -17.5723 -14.2812 -31.792 -31.792 -31.792
+c-17.6348 0 -31.8545 14.2188 -31.8545 31.792s14.2197 31.792 31.8545 31.792c17.5107 0 31.792 -14.2188 31.792 -31.792z" />
+    <glyph glyph-name="uniF112" unicode="&#xf112;" 
+d="M2.30371 128.576v126.848h507.393v-126.848h-507.393z" />
+    <glyph glyph-name="uniF113" unicode="&#xf113;" 
+d="M415.106 -61.2578h-317.007c-52.5352 0 -95.1025 42.5967 -95.1025 95.1016v317.006c0 52.5361 42.5664 95.1025 95.1025 95.1025h317.007c52.5039 0 95.1016 -42.5664 95.1016 -95.1025v-317.006c0 -52.5039 -42.5977 -95.1016 -95.1016 -95.1016zM446.807 350.85
+c0 17.4922 -14.1787 31.7012 -31.7002 31.7012h-317.007c-17.5225 0 -31.7012 -14.209 -31.7012 -31.7012v-317.006c0 -17.5225 14.1787 -31.7002 31.7012 -31.7002h317.007c17.5215 0 31.7002 14.1777 31.7002 31.7002v317.006zM351.704 97.2451v-47.5508
+c0 -8.74512 -7.08887 -15.8506 -15.8496 -15.8506c-8.76172 0 -15.8506 7.10547 -15.8506 15.8506v47.5508c-17.5225 0 -31.7012 14.1787 -31.7012 31.7012v31.7002c0 17.4912 14.1787 31.7002 31.7012 31.7002v142.653c0 8.74512 7.08887 15.8496 15.8506 15.8496
+c8.76074 0 15.8496 -7.10449 15.8496 -15.8496v-142.653c17.5225 0 31.7012 -14.209 31.7012 -31.7002v-31.7002c0 -17.5225 -14.1787 -31.7012 -31.7012 -31.7012zM193.201 192.347v-142.652c0 -8.74512 -7.10449 -15.8506 -15.8506 -15.8506
+s-15.8506 7.10547 -15.8506 15.8506v142.652c-17.5225 0 -31.7012 14.21 -31.7012 31.7012v31.7002c0 17.4912 14.1787 31.7012 31.7012 31.7012v47.5508c0 8.74512 7.10449 15.8496 15.8506 15.8496s15.8506 -7.10449 15.8506 -15.8496v-47.5508
+c17.5225 0 31.7012 -14.21 31.7012 -31.7012v-31.7002c-0.000976562 -17.4912 -14.1787 -31.7012 -31.7012 -31.7012z" />
+    <glyph glyph-name="uniF114" unicode="&#xf114;" 
+d="M25.3525 319.254v31.8145c0 52.7217 85.4834 95.4395 190.881 95.4395s190.882 -42.7178 190.882 -95.4395v-31.8145c0 -35.9141 -39.7363 -67.1689 -98.3926 -83.4639c-1.98828 -0.450195 -3.94531 -1.00977 -5.93359 -1.52246
+c-25.9736 -6.63281 -55.3633 -10.4541 -86.5557 -10.4541c-105.397 0.000976562 -190.881 42.7188 -190.881 95.4404zM384.062 234.299c14.6953 12.1943 23.0537 26.7178 23.0527 43.2002v-51.1074c-7.39453 3.24707 -15.1143 5.81055 -23.0527 7.90723zM205.748 1.33594
+c14.6016 -25.3037 35.8369 -46.2598 61.499 -60.2705c-16.249 -2.26855 -33.3359 -3.57324 -51.0137 -3.57324c-105.397 0 -190.881 42.749 -190.881 95.4395v53.7012c0 -50.9824 79.9062 -83.1836 180.396 -85.2969zM191.44 33.833
+c-93.6377 6.08984 -166.088 46.043 -166.089 94.54v53.7012c0 -47.4561 69.3125 -78.6484 160 -84.458c-0.589844 -5.57715 -0.931641 -11.2471 -0.931641 -16.9639c0 -16.2793 2.4541 -32.0303 7.02051 -46.8193zM192.032 129.243
+c-93.9502 5.93359 -166.68 45.9492 -166.68 94.5703v53.7012c0 -52.7373 85.4834 -85.5146 190.881 -85.5146c4.72266 0 9.35156 0.140625 13.9961 0.280273c-17.2734 -17.5381 -30.4932 -39.0527 -38.1973 -63.0371zM486.647 80.6523
+c0 -79.0674 -64.0928 -143.16 -143.16 -143.16c-79.0684 0 -143.161 64.0928 -143.161 143.16c0 79.0684 64.0938 143.161 143.161 143.161c79.0674 0.000976562 143.16 -64.0928 143.16 -143.161zM438.928 96.5605h-79.5342v79.5322h-31.8125v-79.5322h-79.5342v-31.8145
+h79.5342v-79.5342h31.8125v79.5342h79.5342v31.8145z" />
+    <glyph glyph-name="uniF115" unicode="&#xf115;" 
+d="M208.766 -59.6162c-46.3301 0 -89.874 18.0889 -122.595 50.8799c-32.7598 32.7432 -50.8096 76.2324 -50.8096 122.586c0.0302734 46.3223 18.0498 89.8584 50.8096 122.58l175.544 171.749c47.1777 47.2002 130.493 47.3848 178.093 -0.253906
+c49.1084 -49.1934 49.1084 -129.184 0 -178.322l-157.979 -154.101c-30.4199 -30.4355 -80.4199 -30.4961 -111.148 0.276367c-30.7285 30.79 -30.7285 80.7598 0 111.479l61.1465 61.1553l44.583 -44.582l-61.1465 -61.1475
+c-4.04199 -4.06348 -4.61914 -8.74414 -4.61914 -11.1465c0 -2.43066 0.577148 -7.11133 4.61914 -11.1758c8.06641 -8.03613 14.2168 -8.03613 22.291 0l157.888 154.123c24.3232 24.292 24.3232 64.2871 -0.24707 88.8965c-23.8301 23.8311 -65.334 23.8311 -89.165 0
+l-175.529 -171.766c-20.5908 -20.6211 -32.082 -48.3018 -32.082 -77.7656c0 -29.4971 11.4912 -57.2051 32.3281 -78.0195c41.6963 -41.7354 114.359 -41.7354 156.039 0l78.8203 78.8203l44.5527 -44.5674l-78.8213 -78.8193
+c-32.7275 -32.7617 -76.2568 -50.8799 -122.571 -50.8799z" />
+    <glyph glyph-name="uniF116" unicode="&#xf116;" 
+d="M192.16 1.76074l-190.368 -63.457l63.4561 190.368l317.28 317.28l126.912 -126.912zM65.248 1.76074l95.1836 31.7275l-63.4561 63.4561zM128.704 128.672l63.4561 -63.4561l190.368 190.367l-63.4561 63.457z" />
+    <glyph glyph-name="uniF117" unicode="&#xf117;" 
+d="M62.9756 448l383.425 -255.616l-383.425 -255.616v511.232z" />
+    <glyph glyph-name="uniF118" unicode="&#xf118;" 
+d="M511.232 256.288v-127.808h-191.713v-191.713h-127.808v191.713h-191.712v127.808h191.712v191.712h127.808v-191.712h191.713z" />
+    <glyph glyph-name="uniF119" unicode="&#xf119;" 
+d="M492.673 -62.7197h-474.753c0 61.3486 71.7646 112.591 169.562 129.326v25.1006c-40.3604 23.5342 -67.8223 66.7656 -67.8223 116.86v3.43066c-19.6826 7.0625 -33.918 25.3652 -33.918 47.4551c0 22.0742 14.2354 40.3916 33.9033 47.4248v3.42969
+c0.0146484 74.917 60.7275 135.645 135.644 135.645s135.644 -60.7275 135.644 -135.645v-3.42969c19.668 -7.0332 33.9033 -25.3506 33.9033 -47.4248c0 -22.0898 -14.2354 -40.3926 -33.9033 -47.4551v-3.43066c0 -50.0947 -27.4609 -93.3262 -67.8213 -116.813v-25.1016
+c97.8438 -16.7812 169.562 -68.0234 169.562 -129.372z" />
+    <glyph glyph-name="uniF11A" unicode="&#xf11a;" 
+d="M74.7285 233.082l-63.5254 63.5254c-6.20312 6.18945 -9.30469 14.3311 -9.30469 22.458c0 8.1416 3.10156 16.2686 9.30469 22.457l63.5254 63.5244c9.08887 9.04199 22.7373 11.7871 34.6172 6.90234c11.8486 -4.90137 19.6035 -16.5332 19.6035 -29.3594v-31.7939
+h31.7627v-63.5254h-31.7627v-31.7314c0 -12.8262 -7.75488 -24.459 -19.6035 -29.3594c-11.8799 -4.86914 -25.5283 -2.16992 -34.6172 6.90234zM437.271 150.931l63.5254 -63.5264c6.20312 -6.17188 9.30469 -14.2988 9.30469 -22.457
+c0 -8.12695 -3.10156 -16.2529 -9.30469 -22.4561l-63.5254 -63.5264c-9.08887 -9.05762 -22.7676 -11.7568 -34.6172 -6.88672c-11.8799 4.90137 -19.6035 16.5332 -19.6035 29.3438v31.7627h-31.7627v63.5264h31.7627v31.7627c0 12.8408 7.72363 24.4727 19.6035 29.374
+c11.8496 4.87012 25.5283 2.13965 34.6172 -6.91699zM224.237 96.7109h31.7627v-63.5264h-31.7627v63.5264zM192.475 350.796h31.7627v-63.5244h-31.7627v63.5244zM160.712 160.235c17.5254 0 31.7627 -14.2373 31.7627 -31.7617v-127.051
+c0 -17.5879 -14.2373 -31.7627 -31.7627 -31.7627h-127.052c-17.5254 0 -31.7617 14.1748 -31.7617 31.7627v127.051c0 17.5244 14.2363 31.7617 31.7617 31.7617h127.052zM128.949 33.1846v0v63.5264h-63.5254v-63.5264h63.5254zM256 350.796h31.7627v-63.5244h-31.7627
+v63.5244zM478.339 414.322c17.5566 0 31.7627 -14.2217 31.7627 -31.7627v-127.051c0 -17.541 -14.2061 -31.7637 -31.7627 -31.7637h-127.051c-17.5566 0 -31.7627 14.2227 -31.7627 31.7637v127.051c0 17.541 14.2061 31.7627 31.7627 31.7627h127.051zM446.576 287.271
+v63.5244h-63.5254v-63.5244h63.5254zM287.763 96.7109h31.7627v-63.5264h-31.7627v63.5264z" />
+    <glyph glyph-name="uniF11B" unicode="&#xf11b;" 
+d="M494.778 -2.67969c-29.6025 83.5303 -109.144 143.562 -202.873 143.562v-71.8408c0 -13.2529 -7.31543 -25.3379 -18.9727 -31.5967c-11.6572 -6.25781 -25.8516 -5.61426 -36.833 1.74902l-215.372 143.606c-10.0078 6.70898 -16.0205 17.876 -16.0205 29.8545
+c0 12.0332 6.0127 23.2129 15.9893 29.8926l215.357 143.615c11.0273 7.31641 25.1924 8.03613 36.8486 1.75586c11.6875 -6.21973 19.0029 -18.4199 19.0029 -31.6641v-71.7734c118.944 0 215.388 -96.4668 215.388 -215.44c0 -25.123 -4.58594 -49.2646 -12.5146 -71.7197
+z" />
+    <glyph glyph-name="uniF11C" unicode="&#xf11c;" 
+d="M107.919 318.031c-11.6172 0 -19.7217 8.78223 -19.7217 20.3984v86.7764c0 11.6172 8.10449 19.7217 19.7217 19.7217h148.576c11.6328 0 21.0312 -8.10449 21.0303 -19.7217v-86.0986c0 -11.6162 -8.78125 -21.0762 -20.3838 -21.0762h-149.223zM445.777 444.928
+c42.1543 0 42.1543 -42.0938 42.1553 -42.0938v-421.982c0 -39.4434 -41.416 -40.1836 -41.416 -40.1836v271.543c0 21.0166 -21.6934 22.3721 -21.6934 22.3721h-336.626c-21.0156 0 -21.0156 -21.7246 -21.0156 -21.7246v-272.807
+c-40.7988 0 -42.0938 42.0322 -42.0938 42.0322v420.75s0 42.0938 42.0938 42.0938l-0.677734 -126.882s1.07812 -20.3691 22.1562 -20.3691l335.469 -0.569336s20.2305 -0.308594 21.5859 21.3857zM404.361 212.858c0 0 20.4619 0 20.4619 -21.709v-229.404
+s0.615234 -21.6934 -21.0781 -21.6934h-295.147s-19.7217 0.615234 -19.7217 21.6934l-0.678711 230.112s-0.677734 21.001 21.6943 21.001h294.47zM330.405 45.1934c5.70117 0 10.2305 4.65234 10.2295 10.2305c0 5.5625 -4.52832 10.2148 -10.2295 10.2148h-168.929
+c-5.63867 0 -10.1689 -4.65234 -10.1689 -10.2148c0 -5.57715 4.54492 -10.2305 10.1689 -10.2305h168.929zM330.158 87.3486c5.70117 0 10.4775 4.02148 10.4775 9.86035c0 5.7168 -4.77637 10.4775 -10.4775 10.4775h-168.99
+c-5.83984 0 -10.5391 -4.76074 -10.5391 -10.4775c0 -5.83887 4.69922 -9.86035 10.5391 -9.86035h168.99zM330.405 129.38c5.70117 0 10.2305 4.53027 10.2295 10.2305c0 5.57715 -4.52832 10.1074 -10.2295 10.1074h-168.929
+c-5.63867 0 -10.1689 -4.53027 -10.1689 -10.1074c0 -5.7002 4.54492 -10.2305 10.1689 -10.2305h168.929zM381.435 318.031c-11.6475 0 -19.7217 9.45996 -19.7217 21.0762v86.0986c0 11.6172 8.07422 19.7217 19.7217 19.7217h23.666
+c11.5566 0 19.7227 -8.10547 19.7227 -19.7217v-86.0986c0 -11.6162 -8.16602 -21.0762 -19.7227 -21.0762h-23.666z" />
+    <glyph glyph-name="uniF11D" unicode="&#xf11d;" 
+d="M495.659 19.2988c18.6387 -18.6387 18.6387 -48.8457 -0.000976562 -67.4697c-18.6543 -18.6387 -48.8311 -18.6387 -67.4697 0l-111.865 111.804c-31.4941 -19.4453 -68.2607 -31.1992 -108.021 -31.1992c-114.191 0 -206.767 92.5752 -206.767 206.751
+c0 114.192 92.5752 206.768 206.767 206.768c114.192 0 206.768 -92.5752 206.768 -206.768c0 -39.7588 -11.7539 -76.541 -31.2305 -108.065zM208.303 96.0273c79.0537 0 143.159 64.1045 143.159 143.157c0 79.0537 -64.1055 143.159 -143.159 143.159
+c-79.0527 0 -143.158 -64.1055 -143.158 -143.159c0 -79.0527 64.1055 -143.157 143.158 -143.157z" />
+    <glyph glyph-name="uniF11E" unicode="&#xf11e;" 
+d="M228.974 393.2c0 -60.4707 -0.255859 -227.632 -0.255859 -227.632s170.018 -0.0644531 227.937 -0.0644531c0 -125.756 -101.94 -227.696 -227.681 -227.696c-125.756 0 -227.695 101.94 -227.695 227.696c0 125.307 101.25 226.989 226.38 227.696h1.31543z
+M510.722 201.067l-245.445 -0.353516s-0.641602 245.478 0.352539 245.478c135.386 0 245.093 -109.739 245.093 -245.124z" />
+    <glyph glyph-name="uniF11F" unicode="&#xf11f;" 
+d="M509.952 192.512c0 -10.7109 -0.868164 -21.2646 -2.16992 -31.6504c-0.326172 -2.51074 -0.744141 -5.05273 -1.14746 -7.56348c-1.37793 -8.68066 -3.13086 -17.2979 -5.34668 -25.6992c-0.417969 -1.48828 -0.744141 -3.00684 -1.13184 -4.47949
+c-6.04492 -21.002 -14.6631 -40.9824 -25.5752 -59.4111c-21.8232 -37.0293 -52.7305 -67.9209 -89.7598 -89.7764c-18.4297 -10.9121 -38.3936 -19.499 -59.4111 -25.5596c-1.48828 -0.387695 -2.97656 -0.712891 -4.47949 -1.13184
+c-8.41699 -2.21582 -16.9727 -3.96777 -25.6836 -5.34766c-2.51074 -0.387695 -5.05273 -0.836914 -7.58008 -1.13184c-10.4014 -1.33203 -20.9414 -2.20117 -31.667 -2.20117v0v0c-10.7256 0 -21.2656 0.869141 -31.6504 2.16992
+c-2.57324 0.326172 -5.05371 0.744141 -7.5957 1.14746c-8.71094 1.37891 -17.2979 3.13086 -25.7148 5.34668c-1.44043 0.418945 -2.99121 0.744141 -4.44824 1.13184c-21.0488 6.04492 -40.9814 14.6631 -59.4268 25.5752
+c-37.0137 21.8242 -67.9209 52.7305 -89.8066 89.7598c-10.8965 18.4307 -19.4834 38.3936 -25.5127 59.4121c-0.40332 1.47168 -0.744141 2.97559 -1.14746 4.47949c-2.23145 8.41602 -3.96777 16.9717 -5.31641 25.6836
+c-0.387695 2.50977 -0.836914 5.03613 -1.19336 7.5791c-1.27148 10.4023 -2.13965 20.9561 -2.13965 31.667v0v0c0 10.7109 0.868164 21.2666 2.16992 31.6504c0.30957 2.57324 0.744141 5.05273 1.17773 7.59473c1.34863 8.71191 3.10059 17.2988 5.34766 25.7148
+c0.387695 1.44238 0.728516 2.99219 1.14746 4.44922c6.0293 20.9863 14.6318 40.9668 25.5283 59.4121c21.8555 37.0137 52.793 67.9355 89.8066 89.791c18.3994 10.8652 38.3779 19.4678 59.3809 25.4971c1.47266 0.418945 2.99219 0.758789 4.44824 1.14746
+c8.40137 2.24707 17.0186 3.96777 25.6992 5.34668c2.54199 0.37207 5.02148 0.837891 7.61035 1.19336c10.3701 1.28711 20.9102 2.15527 31.6357 2.15527v0v0c10.7256 0 21.2656 -0.868164 31.6504 -2.15527c2.51172 -0.324219 5.05371 -0.758789 7.56445 -1.19238
+c8.67969 -1.34863 17.2969 -3.09961 25.6982 -5.34668c1.48828 -0.388672 3.00684 -0.729492 4.47949 -1.14746c21.0029 -6.03027 40.9834 -14.6328 59.4121 -25.498c37.0293 -21.8857 67.9209 -52.8242 89.7764 -89.8066
+c10.9121 -18.4443 19.499 -38.3779 25.5596 -59.4268c0.386719 -1.45703 0.712891 -2.97559 1.13184 -4.44824c2.21582 -8.41699 3.96777 -17.0039 5.34766 -25.7148c0.387695 -2.54199 0.835938 -5.00586 1.13086 -7.5791
+c1.33301 -10.3701 2.20117 -20.9258 2.20117 -31.6367v0v0zM108.486 250.219l-47.1973 47.2285c-16.957 -31.3887 -27.4971 -66.7432 -27.4971 -104.936c0 -38.1914 10.54 -73.5625 27.4971 -104.936l47.1973 47.1836c-7.02148 17.9482 -11.2061 37.3076 -11.2061 57.752
+c0 20.4297 4.18457 39.7744 11.2061 57.707zM256 -29.6963c38.1924 0 73.5635 10.5088 104.935 27.4668l-47.1816 47.2119c-17.9492 -6.97363 -37.3086 -11.1904 -57.7529 -11.1904c-20.4131 0 -39.7734 4.2168 -57.7217 11.2373l-47.2441 -47.2285
+c31.4189 -16.9883 66.7734 -27.4971 104.966 -27.4971zM256 414.72c-38.1924 0 -73.5469 -10.54 -104.935 -27.4971l47.2432 -47.1973c17.918 7.02246 37.2783 11.207 57.6914 11.207c20.4443 0 39.8037 -4.18457 57.7217 -11.207l47.1816 47.1973
+c-31.3398 16.957 -66.7109 27.4971 -104.903 27.4971zM378.28 224.984v0c-11.6416 43.8799 -45.8965 78.1191 -89.792 89.8076v0v0c-4.21582 1.09961 -8.43262 2.03027 -12.834 2.72852c-6.41699 1.14648 -12.8965 1.96777 -19.6543 1.96777
+s-13.2373 -0.821289 -19.6846 -1.96875c-4.34082 -0.697266 -8.60254 -1.62793 -12.7881 -2.72852v0v0c-43.8799 -11.6875 -78.1201 -45.957 -89.8066 -89.8066v0v0c-1.10059 -4.18457 -2.03027 -8.44824 -2.72852 -12.8037
+c-1.14648 -6.44727 -1.96777 -12.9258 -1.96777 -19.6689s0.821289 -13.2207 1.96777 -19.6543c0.666992 -4.40234 1.62793 -8.58594 2.72852 -12.833v0v0c11.6406 -43.8652 45.957 -78.1045 89.8066 -89.7607v0v0c4.18555 -1.10059 8.44727 -2.01562 12.7881 -2.72754
+c6.44727 -1.17871 12.9268 -2 19.6846 -2s13.2373 0.821289 19.6543 1.96777c4.40234 0.666992 8.58691 1.62891 12.834 2.72852v0v0c43.8643 11.6572 78.1045 45.8965 89.7598 89.792v0v0c1.10059 4.21582 2.01562 8.43164 2.72852 12.8184
+c1.17773 6.44824 1.99902 12.9258 1.99902 19.6689s-0.821289 13.2217 -1.96777 19.6689c-0.712891 4.35547 -1.62793 8.61914 -2.72754 12.8037v0zM450.742 297.447l-47.2129 -47.2441c6.97461 -17.917 11.1904 -37.2617 11.1904 -57.6914
+c0 -20.4443 -4.21582 -39.8037 -11.2373 -57.7217l47.2285 -47.1816c16.9883 31.3408 27.4971 66.7119 27.4971 104.903c0 38.1924 -10.5088 73.5469 -27.4658 104.936z" />
+    <glyph glyph-name="uniF120" unicode="&#xf120;" 
+d="M3.49219 294.4l101 102.399h25.0312v-78.7695h378.093v-47.2607h-378.093v-78.7695h-25.0312zM508.508 89.5996l-101.016 -102.399h-25.9082v78.7686h-378.092v47.2607h378.092v78.7705h25.9082z" />
+    <glyph glyph-name="uniF121" unicode="&#xf121;" 
+d="M443.778 287.818v-254.668c0 -52.7051 -42.7891 -95.4941 -95.4951 -95.4941h-191.005c-52.7529 0 -95.4951 42.7881 -95.4951 95.4941v254.668c-17.5625 0 -31.8311 14.2686 -31.8311 31.8311c0 17.5635 14.2686 31.832 31.8311 31.832h95.4951
+c0 52.7529 42.7422 95.4941 95.4941 95.4941c52.7217 0 95.4951 -42.7725 95.4951 -95.4941h95.4951c17.5947 0 31.832 -14.2686 31.832 -31.832c0.0146484 -17.5938 -14.207 -31.8311 -31.8164 -31.8311zM252.772 383.312c-17.5625 0 -31.8311 -14.2676 -31.8311 -31.8311
+h63.6631c0.015625 17.5635 -14.2686 31.8311 -31.832 31.8311zM380.115 287.818h-254.669v-254.668c0 -17.5781 14.2686 -31.8311 31.832 -31.8311h191.005c17.6104 0 31.832 14.2529 31.832 31.8311v254.668zM316.452 255.971h31.8311v-222.836h-31.8311v222.836z
+M220.941 255.971h63.6631v-222.836h-63.6631v222.836zM157.278 255.971h31.8311v-222.836h-31.8311v222.836z" />
+    <glyph glyph-name="uniF122" unicode="&#xf122;" 
+d="M331.522 -63.0078h-191.148c-52.7959 0 -95.5742 42.8086 -95.5742 95.5742v0c9.84668 58.4268 49.1562 107.521 99.1523 135.21c-21.8398 22.8672 -35.4355 53.667 -35.4355 87.7959v63.7158c-0.000976562 70.374 57.0576 127.432 127.432 127.432
+s127.432 -57.0576 127.432 -127.432v-63.7158c0 -34.1289 -13.5957 -64.9287 -35.4043 -87.7969c49.9648 -27.6885 89.2734 -76.7832 99.1211 -135.21v0c-0.000976562 -52.7646 -42.8096 -95.5732 -95.5742 -95.5732zM299.664 255.572v63.7158
+c0 35.1709 -28.5449 63.7158 -63.7158 63.7158c-35.1719 0 -63.7158 -28.5449 -63.7158 -63.7158v-63.7158c0 -35.1709 28.5439 -63.7158 63.7158 -63.7158c35.1709 0 63.7158 28.5449 63.7158 63.7158zM363.38 32.5654c-14.2178 54.8809 -68.1338 95.5742 -127.432 95.5742
+v0v0c-59.3291 0 -113.214 -40.6934 -127.433 -95.5742v0c0 -17.6084 14.2803 -31.8574 31.8584 -31.8574h191.148c17.6084 0 31.8574 14.249 31.8574 31.8574v0z" />
+    <glyph glyph-name="uniF123" unicode="&#xf123;" 
+d="M410.583 169.941c49.8057 -27.6006 88.9912 -76.5381 98.8057 -134.779c0 -52.5977 -42.6729 -95.2705 -95.2705 -95.2705h-43.9131c18.9473 16.5449 32.8418 38.4248 39.3848 63.5137h4.52832c17.5527 0 31.7568 14.2031 31.7568 31.7568
+c-8.1875 31.6318 -29.8184 58.1787 -57.8691 75.2666c-14.793 25.6484 -34.7344 48.7832 -58.9551 67.4834c3.64453 6.24902 6.85449 12.7773 9.59863 19.4922c25.3379 8.38867 43.7129 31.957 43.7129 60.0547v63.5137c0 28.1279 -18.375 51.6982 -43.7285 60.0557
+c-10.3574 25.1816 -27.3213 46.7197 -48.2871 63.4824c9.18066 2.12402 18.6699 3.48926 28.501 3.48926c70.1514 0 127.027 -56.877 127.027 -127.027v-63.5137c0 -34.0205 -13.5518 -64.7227 -35.292 -87.5176zM287.091 -60.1084h-190.54
+c-52.6279 0 -95.2705 42.6719 -95.2705 95.2705v0c9.81543 58.2412 49 107.179 98.8369 134.779c-21.7705 22.7949 -35.3232 53.4971 -35.3232 87.5176v63.5137c0 70.1504 56.877 127.027 127.026 127.027c70.1504 0 127.027 -56.877 127.027 -127.027v-63.5137
+c0 -34.0205 -13.5527 -64.7227 -35.292 -87.5176c49.8057 -27.6006 88.9902 -76.5381 98.8057 -134.779v0c0.000976562 -52.5986 -42.6729 -95.2705 -95.2705 -95.2705zM255.334 257.459v63.5137c0 35.0596 -28.4541 63.5137 -63.5137 63.5137
+s-63.5127 -28.4541 -63.5127 -63.5137v-63.5137c0 -35.0596 28.4531 -63.5127 63.5127 -63.5127s63.5137 28.4531 63.5137 63.5127zM318.848 35.1621c-14.1729 54.7061 -67.917 95.2695 -127.027 95.2695v0v0c-59.1396 0 -112.854 -40.5635 -127.026 -95.2695v0
+c0 -17.5537 14.2344 -31.7568 31.7568 -31.7568h190.54c17.5537 0 31.7568 14.2031 31.7568 31.7568v0z" />
+    <glyph glyph-name="uniF124" unicode="&#xf124;" 
+d="M502.882 356.449c3.70898 -11.8682 6.24414 -24.2305 6.24414 -37.3037c0 -69.8789 -56.6826 -126.592 -126.593 -126.592c-19.4707 0 -37.7676 4.79102 -54.209 12.6406l-253.556 -253.463c-7.54102 -7.66406 -18.1113 -12.3623 -29.793 -12.3623
+c-23.3652 0 -42.2188 18.915 -42.2188 42.1572c0 11.7441 4.75977 22.252 12.3633 29.917l253.493 253.431c-7.91211 16.5352 -12.6719 34.7695 -12.6719 54.2705c0 69.8789 56.6826 126.593 126.592 126.593c12.6719 0 24.7256 -2.44141 36.2842 -5.93457l-78.502 -78.4707
+v-84.374h83.0762z" />
+    <glyph glyph-name="uniF125" unicode="&#xf125;" 
+d="M511.488 39.5137l-102.029 -102.03l-152.973 153.044l-153.044 -153.044l-101.959 102.03l152.974 152.973l-152.974 152.973l101.959 102.029l153.044 -153.043l152.973 153.043l102.029 -102.029l-153.115 -152.973z" />
+  </font>
+</defs></svg>

http://git-wip-us.apache.org/repos/asf/couchdb/blob/7d376196/src/fauxton/assets/img/fontcustom_fauxton.ttf
----------------------------------------------------------------------
diff --git a/src/fauxton/assets/img/fontcustom_fauxton.ttf b/src/fauxton/assets/img/fontcustom_fauxton.ttf
new file mode 100644
index 0000000..4df286c
Binary files /dev/null and b/src/fauxton/assets/img/fontcustom_fauxton.ttf differ

http://git-wip-us.apache.org/repos/asf/couchdb/blob/7d376196/src/fauxton/assets/img/fontcustom_fauxton.woff
----------------------------------------------------------------------
diff --git a/src/fauxton/assets/img/fontcustom_fauxton.woff b/src/fauxton/assets/img/fontcustom_fauxton.woff
new file mode 100644
index 0000000..a6a3fb2
Binary files /dev/null and b/src/fauxton/assets/img/fontcustom_fauxton.woff differ

http://git-wip-us.apache.org/repos/asf/couchdb/blob/7d376196/src/fauxton/assets/img/linen.png
----------------------------------------------------------------------
diff --git a/src/fauxton/assets/img/linen.png b/src/fauxton/assets/img/linen.png
new file mode 100644
index 0000000..365c61a
Binary files /dev/null and b/src/fauxton/assets/img/linen.png differ

http://git-wip-us.apache.org/repos/asf/couchdb/blob/7d376196/src/fauxton/assets/img/minilogo.png
----------------------------------------------------------------------
diff --git a/src/fauxton/assets/img/minilogo.png b/src/fauxton/assets/img/minilogo.png
new file mode 100644
index 0000000..6d48d23
Binary files /dev/null and b/src/fauxton/assets/img/minilogo.png differ

http://git-wip-us.apache.org/repos/asf/couchdb/blob/7d376196/src/fauxton/assets/index.underscore
----------------------------------------------------------------------
diff --git a/src/fauxton/assets/index.underscore b/src/fauxton/assets/index.underscore
index 7ccb930..3d273d3 100644
--- a/src/fauxton/assets/index.underscore
+++ b/src/fauxton/assets/index.underscore
@@ -25,12 +25,6 @@
 
   <!-- Application styles. -->
   <link rel="stylesheet" href="<%= css %>">
-  <style type="text/css">
-    body {
-    padding-top: 60px;
-    padding-bottom: 40px;
-    }
-  </style>
   <% if (base) { %>
   <base href="<%= base %>"></base>
   <% } %>
@@ -41,7 +35,6 @@
   <div role="main" id="main">
     <div id="global-notifications" class="container errors-container"></div>
     <div id="app-container"></div>
-    <hr>
 
     <footer>
       <div id="footer-content" class="container"></div>


Mime
View raw message