couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gar...@apache.org
Subject [2/3] fauxton commit: updated refs/heads/database-pagination to 73a24d3
Date Wed, 27 Aug 2014 16:48:15 GMT
Clean up other layouts


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

Branch: refs/heads/database-pagination
Commit: f899c4f1e449020047a6befef6bb1b449f315f53
Parents: 3ad617d
Author: Garren Smith <garren.smith@gmail.com>
Authored: Wed Aug 27 16:32:51 2014 +0200
Committer: Garren Smith <garren.smith@gmail.com>
Committed: Wed Aug 27 16:50:46 2014 +0200

----------------------------------------------------------------------
 app/addons/documents/routes.js               | 1 +
 app/addons/documents/views.js                | 5 +++--
 app/templates/layouts/with_tabs_sidebar.html | 6 +++---
 assets/less/fauxton.less                     | 3 ++-
 4 files changed, 9 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/f899c4f1/app/addons/documents/routes.js
----------------------------------------------------------------------
diff --git a/app/addons/documents/routes.js b/app/addons/documents/routes.js
index 8eca7f6..c176116 100644
--- a/app/addons/documents/routes.js
+++ b/app/addons/documents/routes.js
@@ -193,6 +193,7 @@ function(app, FauxtonAPI, Documents, Changes, Index, DocEditor, Databases,
Resou
         collection: this.data.designDocs,
         database: this.data.database
       }));
+
     },
     designDocMetadata:  function(database, ddoc){
       this.toolsView && this.toolsView.remove();

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/f899c4f1/app/addons/documents/views.js
----------------------------------------------------------------------
diff --git a/app/addons/documents/views.js b/app/addons/documents/views.js
index 7085bd8..185c975 100644
--- a/app/addons/documents/views.js
+++ b/app/addons/documents/views.js
@@ -258,10 +258,11 @@ function(app, FauxtonAPI, Components, Documents, Databases, Views, QueryOptions,
         database: this.database,
       }));
 
-      this.toolsView = this.setView(".js-search", new Views.JumpToDoc({
+      //disable for now. Will enable with new documents PR that will come next
+      /*this.toolsView = this.setView(".js-search", new Views.JumpToDoc({
         database: this.database,
         collection: this.database.allDocs
-      }));
+        }));*/
     },
 
     afterRender: function () {

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/f899c4f1/app/templates/layouts/with_tabs_sidebar.html
----------------------------------------------------------------------
diff --git a/app/templates/layouts/with_tabs_sidebar.html b/app/templates/layouts/with_tabs_sidebar.html
index a0ed03d..3d86130 100644
--- a/app/templates/layouts/with_tabs_sidebar.html
+++ b/app/templates/layouts/with_tabs_sidebar.html
@@ -15,10 +15,10 @@ the License.
 <div id="primary-navbar"></div>
 <div id="dashboard" class="container-fluid">
 
-  <header class="fixed-header">
+  <div class="fixed-header">
     <div id="breadcrumbs"></div>
-    <div id="api-navbar"></div>
-  </header>
+    <div id="api-navbar" class="window-resizeable"></div>
+  </div>
 
   <div class="with-sidebar content-area">
 

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/f899c4f1/assets/less/fauxton.less
----------------------------------------------------------------------
diff --git a/assets/less/fauxton.less b/assets/less/fauxton.less
index 8337761..edfb4e4 100644
--- a/assets/less/fauxton.less
+++ b/assets/less/fauxton.less
@@ -984,7 +984,7 @@ div.add-dropdown {
 #right-content,
 #dashboard-lower-content{
   .view {
-    background-color:#A8A1A1;
+    //background-color:#A8A1A1;
   }
 }
 
@@ -1298,6 +1298,7 @@ footer.pagination-footer {
   bottom:0;
   height: 50px;
   border-top:1px solid #ccc;
+  margin-left: -15px;
   .pagination{
     .box-shadow(none);
     position: absolute;


Mime
View raw message