couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From benk...@apache.org
Subject [1/8] fauxton commit: updated refs/heads/master to c9bf8a5
Date Thu, 03 Mar 2016 18:01:47 GMT
Repository: couchdb-fauxton
Updated Branches:
  refs/heads/master b7c786586 -> c9bf8a59a


new db icon


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

Branch: refs/heads/master
Commit: c9bf8a59a686eb27153d51835a3409855d9ff534
Parents: 7927162
Author: Ben Keen <ben.keen@gmail.com>
Authored: Mon Feb 22 20:01:42 2016 -0800
Committer: Ben Keen <ben.keen@gmail.com>
Committed: Thu Mar 3 09:00:16 2016 -0800

----------------------------------------------------------------------
 app/addons/components/react-components.react.jsx               | 2 +-
 app/addons/databases/tests/nightwatch/deletesDatabase.js       | 4 ++--
 .../databases/tests/nightwatch/deletesDatabaseSpecialChars.js  | 4 ++--
 app/addons/documents/tests/nightwatch/deleteDatabaseModal.js   | 4 ++--
 assets/less/fauxton.less                                       | 6 +++++-
 5 files changed, 12 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/c9bf8a59/app/addons/components/react-components.react.jsx
----------------------------------------------------------------------
diff --git a/app/addons/components/react-components.react.jsx b/app/addons/components/react-components.react.jsx
index 81b7d05..8ddeecf 100644
--- a/app/addons/components/react-components.react.jsx
+++ b/app/addons/components/react-components.react.jsx
@@ -1528,7 +1528,7 @@ function (app, FauxtonAPI, React, ReactDOM, Actions, Stores, FauxtonComponents,
     connectToStores: connectToStores,
     ApiBarController: ApiBarController,
     renderMenuDropDown: function (el, opts) {
-      ReactDOM.render(<MenuDropDown icon="fonticon-cog" links={opts.links} />, el);
+      ReactDOM.render(<MenuDropDown icon="fonticon-vertical-ellipsis" links={opts.links}
/>, el);
     },
     removeMenuDropDown: function (el) {
       ReactDOM.unmountComponentAtNode(el);

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/c9bf8a59/app/addons/databases/tests/nightwatch/deletesDatabase.js
----------------------------------------------------------------------
diff --git a/app/addons/databases/tests/nightwatch/deletesDatabase.js b/app/addons/databases/tests/nightwatch/deletesDatabase.js
index d3f7eea..f28c199 100644
--- a/app/addons/databases/tests/nightwatch/deletesDatabase.js
+++ b/app/addons/databases/tests/nightwatch/deletesDatabase.js
@@ -20,8 +20,8 @@ module.exports = {
       .createDatabase(newDatabaseName)
       .loginToGUI()
       .url(baseUrl + '/#/database/' + newDatabaseName + '/_all_docs')
-      .waitForElementPresent('#header-dropdown-menu a.dropdown-toggle.icon.fonticon-cog',
waitTime, false)
-      .clickWhenVisible("#header-dropdown-menu a.dropdown-toggle.icon.fonticon-cog", waitTime,
false)
+      .waitForElementPresent('#header-dropdown-menu a.dropdown-toggle.icon.fonticon-vertical-ellipsis',
waitTime, false)
+      .clickWhenVisible("#header-dropdown-menu a.dropdown-toggle.icon.fonticon-vertical-ellipsis",
waitTime, false)
       .waitForElementPresent('#header-dropdown-menu .fonticon-trash', waitTime, false)
       .waitForElementPresent('#delete-db-modal', waitTime, false)
       .clickWhenVisible('#header-dropdown-menu .fonticon-trash', waitTime, false)

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/c9bf8a59/app/addons/databases/tests/nightwatch/deletesDatabaseSpecialChars.js
----------------------------------------------------------------------
diff --git a/app/addons/databases/tests/nightwatch/deletesDatabaseSpecialChars.js b/app/addons/databases/tests/nightwatch/deletesDatabaseSpecialChars.js
index d43c330..de556d9 100644
--- a/app/addons/databases/tests/nightwatch/deletesDatabaseSpecialChars.js
+++ b/app/addons/databases/tests/nightwatch/deletesDatabaseSpecialChars.js
@@ -20,8 +20,8 @@ module.exports = {
       .createDatabase(newDatabaseName)
       .loginToGUI()
       .url(baseUrl + '/#/database/' + encodeURIComponent(newDatabaseName) + '/_all_docs')
-      .waitForElementPresent('#header-dropdown-menu a.dropdown-toggle.icon.fonticon-cog',
waitTime, false)
-      .clickWhenVisible("#header-dropdown-menu a.dropdown-toggle.icon.fonticon-cog", waitTime,
false)
+      .waitForElementPresent('#header-dropdown-menu a.dropdown-toggle.icon.fonticon-vertical-ellipsis',
waitTime, false)
+      .clickWhenVisible("#header-dropdown-menu a.dropdown-toggle.icon.fonticon-vertical-ellipsis",
waitTime, false)
       .waitForElementPresent('#header-dropdown-menu .fonticon-trash', waitTime, false)
       .clickWhenVisible('#header-dropdown-menu .fonticon-trash', waitTime, false)
       .waitForElementPresent('#db-name', waitTime, false)

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/c9bf8a59/app/addons/documents/tests/nightwatch/deleteDatabaseModal.js
----------------------------------------------------------------------
diff --git a/app/addons/documents/tests/nightwatch/deleteDatabaseModal.js b/app/addons/documents/tests/nightwatch/deleteDatabaseModal.js
index 30fb60e..5a78d92 100644
--- a/app/addons/documents/tests/nightwatch/deleteDatabaseModal.js
+++ b/app/addons/documents/tests/nightwatch/deleteDatabaseModal.js
@@ -34,7 +34,7 @@ module.exports = {
     client
       .loginToGUI()
       .url(baseUrl + '/#/database/_replicator/_all_docs')
-      .clickWhenVisible("#header-dropdown-menu a.dropdown-toggle.icon.fonticon-cog", waitTime,
false)
+      .clickWhenVisible("#header-dropdown-menu a.dropdown-toggle.icon.fonticon-vertical-ellipsis",
waitTime, false)
       .waitForElementPresent("#header-dropdown-menu .fonticon-trash", waitTime, false)
       .clickWhenVisible('#header-dropdown-menu .fonticon-trash', waitTime, false)
       .waitForElementPresent('#delete-db-modal', waitTime, false)
@@ -51,7 +51,7 @@ module.exports = {
     client
       .loginToGUI()
       .url(baseUrl + '/#/database/' + newDatabaseName + '/_all_docs')
-      .clickWhenVisible('#header-dropdown-menu a.dropdown-toggle.icon.fonticon-cog', waitTime,
false)
+      .clickWhenVisible('#header-dropdown-menu a.dropdown-toggle.icon.fonticon-vertical-ellipsis',
waitTime, false)
       .waitForElementPresent("#header-dropdown-menu .fonticon-trash", waitTime, false)
       .clickWhenVisible('#header-dropdown-menu .fonticon-trash', waitTime, false)
       .waitForElementPresent('#delete-db-modal', waitTime, false)

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/c9bf8a59/assets/less/fauxton.less
----------------------------------------------------------------------
diff --git a/assets/less/fauxton.less b/assets/less/fauxton.less
index 7e7baf0..05ab404 100644
--- a/assets/less/fauxton.less
+++ b/assets/less/fauxton.less
@@ -452,15 +452,19 @@ body #dashboard .flex-body#breadcrumbs {
     top: 0;
     .dropdown-toggle {
       color: #666666;
+      &:before {
+        margin-top: 6px;
+        margin: 6px -5px 0 6px;
+      }
     }
     a {
       padding: 10px;
       text-decoration: none;
       &:before {
         font-size: 20px;
-        margin-top: 6px;
       }
     }
+
     .dropdown {
       height: @collapsedNavWidth;
       border-left: 1px solid #ccc;


Mime
View raw message