couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From robertkowal...@apache.org
Subject [2/2] fauxton commit: updated refs/heads/master to 874283c
Date Fri, 29 Jan 2016 15:08:08 GMT
make togglebutton available everywhere in documents

PR: #623
PR-URL: https://github.com/apache/couchdb-fauxton/pull/623
Reviewed-By: Benjamin Keen <ben.keen@gmail.com>


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

Branch: refs/heads/master
Commit: 874283c13106aeacbfb480055b6fea6171c96da2
Parents: d4e4fff
Author: Robert Kowalski <robertkowalski@apache.org>
Authored: Thu Jan 21 16:10:46 2016 +0100
Committer: Robert Kowalski <robertkowalski@apache.org>
Committed: Fri Jan 29 16:07:43 2016 +0100

----------------------------------------------------------------------
 app/addons/documents/assets/less/documents.less  | 19 +++++++++++++++++++
 app/addons/documents/assets/less/header.less     | 19 -------------------
 app/addons/documents/header/header.react.jsx     |  2 +-
 app/addons/documents/tests/nightwatch/changes.js |  4 ++--
 .../documents/tests/nightwatch/tableView.js      |  4 ++--
 5 files changed, 24 insertions(+), 24 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/874283c1/app/addons/documents/assets/less/documents.less
----------------------------------------------------------------------
diff --git a/app/addons/documents/assets/less/documents.less b/app/addons/documents/assets/less/documents.less
index 0ea173a..c934d37 100644
--- a/app/addons/documents/assets/less/documents.less
+++ b/app/addons/documents/assets/less/documents.less
@@ -21,6 +21,25 @@
 @import "doc-editor.less";
 @import "header.less";
 
+.two-sides-toggle-button {
+  font-size: 15px;
+  padding: 11px;
+
+  button.btn {
+    padding: 10px 15px;
+    &:hover {
+      background-color: @brandPrimary;
+      color: white;
+    }
+    &.active {
+      color: @brandPrimary;
+      &:hover {
+        background-color: white;
+      }
+    }
+  }
+}
+
 button.beautify {
   margin-top: 20px;
 }

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/874283c1/app/addons/documents/assets/less/header.less
----------------------------------------------------------------------
diff --git a/app/addons/documents/assets/less/header.less b/app/addons/documents/assets/less/header.less
index 5c733a7..0670cbb 100644
--- a/app/addons/documents/assets/less/header.less
+++ b/app/addons/documents/assets/less/header.less
@@ -25,23 +25,4 @@
       }
     }
   }
-
-  .header-toggle-button {
-    font-size: 15px;
-    padding: 11px;
-
-    button.btn {
-      padding: 10px 15px;
-      &:hover {
-        background-color: @brandPrimary;
-        color: white;
-      }
-      &.active {
-        color: @brandPrimary;
-        &:hover {
-          background-color: white;
-        }
-      }
-    }
-  }
 }

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/874283c1/app/addons/documents/header/header.react.jsx
----------------------------------------------------------------------
diff --git a/app/addons/documents/header/header.react.jsx b/app/addons/documents/header/header.react.jsx
index 5c2f291..67705f9 100644
--- a/app/addons/documents/header/header.react.jsx
+++ b/app/addons/documents/header/header.react.jsx
@@ -71,7 +71,7 @@ function (app, FauxtonAPI, React, Actions, ReactComponents,
 
       return (
         <div className="alternative-header">
-          <ButtonGroup className="header-toggle-button">
+          <ButtonGroup className="two-sides-toggle-button">
             <Button
               className={isTableViewSelected ? '' : 'active'}
               onClick={this.toggleTableView.bind(this, false)}

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/874283c1/app/addons/documents/tests/nightwatch/changes.js
----------------------------------------------------------------------
diff --git a/app/addons/documents/tests/nightwatch/changes.js b/app/addons/documents/tests/nightwatch/changes.js
index 15d410d..81c91e5 100644
--- a/app/addons/documents/tests/nightwatch/changes.js
+++ b/app/addons/documents/tests/nightwatch/changes.js
@@ -20,10 +20,10 @@ module.exports = {
     client
       .loginToGUI()
       .url(baseUrl + '/#/database/' + newDatabaseName + '/_all_docs')
-      .waitForElementPresent('.header-toggle-button', waitTime, false)
+      .waitForElementPresent('.two-sides-toggle-button', waitTime, false)
       .clickWhenVisible('#changes')
       .waitForElementPresent('.js-changes-view', waitTime, false)
-      .assert.elementNotPresent('.header-toggle-button')
+      .assert.elementNotPresent('.two-sides-toggle-button')
       .end();
   },
 

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/874283c1/app/addons/documents/tests/nightwatch/tableView.js
----------------------------------------------------------------------
diff --git a/app/addons/documents/tests/nightwatch/tableView.js b/app/addons/documents/tests/nightwatch/tableView.js
index 70ce7f8..4939e05 100644
--- a/app/addons/documents/tests/nightwatch/tableView.js
+++ b/app/addons/documents/tests/nightwatch/tableView.js
@@ -27,7 +27,7 @@ module.exports = {
       .checkForDocumentCreated(newDocumentName2)
       .url(baseUrl + '/#/database/' + newDatabaseName + '/_all_docs?include_docs=true')
 
-      .clickWhenVisible('.alternative-header .header-toggle-button button:last-child')
+      .clickWhenVisible('.alternative-header .two-sides-toggle-button button:last-child')
       .getText('.table', function (result) {
         var data = result.value;
 
@@ -57,7 +57,7 @@ module.exports = {
       .checkForDocumentCreated(newDocumentName2)
       .url(baseUrl + '/#/database/' + newDatabaseName + '/_all_docs')
 
-      .clickWhenVisible('.alternative-header .header-toggle-button button:last-child')
+      .clickWhenVisible('.alternative-header .two-sides-toggle-button button:last-child')
       .getText('.table', function (result) {
         var data = result.value;
 


Mime
View raw message