Changes from review: Fix button text trigger Toggle button gray on click Change padding
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/ce6d7d53 Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/ce6d7d53 Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/ce6d7d53 Branch: refs/heads/Query-UI-Cleanup Commit: ce6d7d537a124f361b0d99ef62c73cbc616a3bc7 Parents: 68a828c Author: Robert Kowalski <[email protected]> Authored: Wed Apr 9 21:26:47 2014 +0200 Committer: suelockwood <[email protected]> Committed: Mon Apr 14 14:40:15 2014 -0400 ---------------------------------------------------------------------- .../app/addons/documents/assets/less/documents.less | 4 ++-- src/fauxton/app/addons/documents/templates/changes.html | 2 +- src/fauxton/app/addons/documents/views.js | 11 ++++++++--- 3 files changed, 11 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb/blob/ce6d7d53/src/fauxton/app/addons/documents/assets/less/documents.less ---------------------------------------------------------------------- diff --git a/src/fauxton/app/addons/documents/assets/less/documents.less b/src/fauxton/app/addons/documents/assets/less/documents.less index e629b2c..9fefd8f 100644 --- a/src/fauxton/app/addons/documents/assets/less/documents.less +++ b/src/fauxton/app/addons/documents/assets/less/documents.less @@ -91,10 +91,10 @@ button.beautify { border-bottom: none; } .row-fluid { - padding: 10px 0 10px 0; + padding: 4px 0 4px 0; } .row-fluid:first { - padding: 0px 0 10px 0; + padding: 0px 0 4px 0; } a:hover.js-copy { text-decoration: none; http://git-wip-us.apache.org/repos/asf/couchdb/blob/ce6d7d53/src/fauxton/app/addons/documents/templates/changes.html ---------------------------------------------------------------------- diff --git a/src/fauxton/app/addons/documents/templates/changes.html b/src/fauxton/app/addons/documents/templates/changes.html index 460ff74..8b598d2 100644 --- a/src/fauxton/app/addons/documents/templates/changes.html +++ b/src/fauxton/app/addons/documents/templates/changes.html @@ -49,7 +49,7 @@ the License. changes </div> <div class="span10"> - <button class="js-toggle-json btn-large btn-primary" type="button">View JSON</button> + <button class="js-toggle-json btn-small btn-primary" type="button">View JSON</button> </div> </div> <div class="js-json-container"> http://git-wip-us.apache.org/repos/asf/couchdb/blob/ce6d7d53/src/fauxton/app/addons/documents/views.js ---------------------------------------------------------------------- diff --git a/src/fauxton/app/addons/documents/views.js b/src/fauxton/app/addons/documents/views.js index 7892d18..bae49c0 100644 --- a/src/fauxton/app/addons/documents/views.js +++ b/src/fauxton/app/addons/documents/views.js @@ -1918,10 +1918,15 @@ function(app, FauxtonAPI, Components, Documents, Databases, pouchdb, var $button = this.$(event.target), $container = $button.closest('.change-box').find(".js-json-container"); - if ($container.hasClass("js-hidden")) { - $button.text("Close JSON"); + if (!$container.is(":visible")) { + $button + .text("Close JSON") + .addClass("btn-secondary") + .removeClass("btn-primary"); } else { - $button.text("View JSON"); + $button.text("View JSON") + .addClass("btn-primary") + .removeClass("btn-secondary"); } $container.slideToggle();
