couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gar...@apache.org
Subject [3/3] fauxton commit: updated refs/heads/master to 63d7ecb
Date Thu, 18 Sep 2014 09:09:03 GMT
edit doc page now has ID in title; other

The edit doc page now has the ID in the title as a second breadcrumb;
minor CSS change so the second crumb doesn't wrap.


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

Branch: refs/heads/master
Commit: 63d7ecb27025dd63296748632efb39564d2fa909
Parents: 7771212
Author: Benjamin Keen <ben.keen@gmail.com>
Authored: Wed Sep 17 19:10:32 2014 -0700
Committer: Garren Smith <garren.smith@gmail.com>
Committed: Thu Sep 18 11:08:41 2014 +0200

----------------------------------------------------------------------
 app/addons/documents/routes-doc-editor.js | 4 ++--
 app/templates/layouts/with_sidebar.html   | 2 +-
 assets/less/fauxton.less                  | 7 ++++++-
 3 files changed, 9 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/63d7ecb2/app/addons/documents/routes-doc-editor.js
----------------------------------------------------------------------
diff --git a/app/addons/documents/routes-doc-editor.js b/app/addons/documents/routes-doc-editor.js
index 57f61c4..2e60950 100644
--- a/app/addons/documents/routes-doc-editor.js
+++ b/app/addons/documents/routes-doc-editor.js
@@ -52,8 +52,8 @@ function(app, FauxtonAPI, Documents, DocEditor, Databases) {
 
     crumbs: function() {
       return [
-        {"name": this.database.id, "link": Databases.databaseUrl(this.database)}
-        //{"name": this.docID, "link": "#"}
+        {"name": this.database.id, "link": Databases.databaseUrl(this.database)},
+        {"name": this.docID, "link": "#"}
       ];
     },
 

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/63d7ecb2/app/templates/layouts/with_sidebar.html
----------------------------------------------------------------------
diff --git a/app/templates/layouts/with_sidebar.html b/app/templates/layouts/with_sidebar.html
index 4eba634..8adac78 100644
--- a/app/templates/layouts/with_sidebar.html
+++ b/app/templates/layouts/with_sidebar.html
@@ -17,7 +17,7 @@ the License.
 <div id="dashboard" class="container-fluid">
   <header class="fixed-header">
     <div id="breadcrumbs"></div>
-    <div id="api-navbar"></div>
+    <div id="api-navbar" class="window-resizeable"></div>
   </header>
 
   <div class="with-sidebar content-area">

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/63d7ecb2/assets/less/fauxton.less
----------------------------------------------------------------------
diff --git a/assets/less/fauxton.less b/assets/less/fauxton.less
index f8a1141..d7c2d0e 100644
--- a/assets/less/fauxton.less
+++ b/assets/less/fauxton.less
@@ -1110,9 +1110,14 @@ div.add-dropdown {
   }
 }
 
+/* only specify the sidebar width when there’s a sidebar */
+.with-sidebar #breadcrumbs {
+  width: @sidebarWidth;
+}
+
 #breadcrumbs {
   height: 60px;
-  width: @sidebarWidth;
+
   /* these styles are for the new header*/
   .header-left{
     > div{


Mime
View raw message