couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From benk...@apache.org
Subject fauxton commit: updated refs/heads/master to 6542a69
Date Thu, 08 Oct 2015 21:35:54 GMT
Repository: couchdb-fauxton
Updated Branches:
  refs/heads/master e77ade9db -> 6542a6928


Fix for header on full page doc editor

Drat, missed this one. This fixes a layout issue on the full
page doc editor. Test included to confirm the breadcrumb
and API URL are always visible.


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

Branch: refs/heads/master
Commit: 6542a692827b7746a72df6e7a353113b91ff00aa
Parents: e77ade9
Author: Ben Keen <ben.keen@gmail.com>
Authored: Wed Oct 7 18:19:02 2015 -0700
Committer: Ben Keen <ben.keen@gmail.com>
Committed: Wed Oct 7 18:26:25 2015 -0700

----------------------------------------------------------------------
 app/addons/documents/assets/less/doc-editor.less         |  4 +++-
 app/addons/documents/tests/nightwatch/createsDocument.js |  4 ++++
 app/templates/layouts/doc_editor.html                    | 10 ++++++----
 3 files changed, 13 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/6542a692/app/addons/documents/assets/less/doc-editor.less
----------------------------------------------------------------------
diff --git a/app/addons/documents/assets/less/doc-editor.less b/app/addons/documents/assets/less/doc-editor.less
index 3eac02d..ab0cc4a 100644
--- a/app/addons/documents/assets/less/doc-editor.less
+++ b/app/addons/documents/assets/less/doc-editor.less
@@ -55,7 +55,9 @@
 
   &#dashboard > header {
     z-index: 2;
-    .box-shadow(none);
+    > div {
+      .box-shadow(none);
+    }
   }
 
   #editor-container {

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/6542a692/app/addons/documents/tests/nightwatch/createsDocument.js
----------------------------------------------------------------------
diff --git a/app/addons/documents/tests/nightwatch/createsDocument.js b/app/addons/documents/tests/nightwatch/createsDocument.js
index 684233a..1b4e321 100644
--- a/app/addons/documents/tests/nightwatch/createsDocument.js
+++ b/app/addons/documents/tests/nightwatch/createsDocument.js
@@ -28,6 +28,10 @@ module.exports = {
       .verify.urlEquals(baseUrl + '/#/database/' + newDatabaseName + '/new')
       .waitForElementPresent('.ace_layer.ace_cursor-layer.ace_hidden-cursors', waitTime,
false)
 
+      // confirm the header elements are showing up
+      .waitForElementVisible('.js-lastelement', waitTime, true)
+      .waitForElementVisible('#api-navbar', waitTime, true)
+
       //.pause(1000) // looks like auto-focus happens during the next execute() line, so
this slows it down
       .execute('\
         var editor = ace.edit("doc-editor");\

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/6542a692/app/templates/layouts/doc_editor.html
----------------------------------------------------------------------
diff --git a/app/templates/layouts/doc_editor.html b/app/templates/layouts/doc_editor.html
index 4fb85df..470d930 100644
--- a/app/templates/layouts/doc_editor.html
+++ b/app/templates/layouts/doc_editor.html
@@ -13,10 +13,12 @@ the License.
 */%>
 
 <div id="dashboard" class="one-pane doc-editor-page">
-  <header class="flex-layout flex-row">
-    <div id="breadcrumbs" class="flex-body"></div>
-    <div id="api-navbar"></div>
-    <div id="notification-center-btn"></div>
+  <header>
+    <div class="flex-layout flex-row">
+      <div id="breadcrumbs" class="flex-body"></div>
+      <div id="api-navbar"></div>
+      <div id="notification-center-btn"></div>
+    </div>
   </header>
 
   <div id="dashboard-content"></div>


Mime
View raw message