diff options
| author | Robert Kowalski <rok@kowalski.gd> | 2014-04-09 21:26:47 +0200 |
|---|---|---|
| committer | suelockwood <deathbear@apache.org> | 2014-04-14 14:40:15 -0400 |
| commit | ce6d7d537a124f361b0d99ef62c73cbc616a3bc7 (patch) | |
| tree | 303d753b27416945730d0e93e17fef779540d3d2 | |
| parent | 68a828ca9a948711fd9ff92cd432b0454a48a609 (diff) | |
| download | couchdb-ce6d7d537a124f361b0d99ef62c73cbc616a3bc7.tar.gz | |
Changes from review:
Fix button text trigger
Toggle button gray on click
Change padding
| -rw-r--r-- | src/fauxton/app/addons/documents/assets/less/documents.less | 4 | ||||
| -rw-r--r-- | src/fauxton/app/addons/documents/templates/changes.html | 2 | ||||
| -rw-r--r-- | src/fauxton/app/addons/documents/views.js | 11 |
3 files changed, 11 insertions, 6 deletions
diff --git a/src/fauxton/app/addons/documents/assets/less/documents.less b/src/fauxton/app/addons/documents/assets/less/documents.less index e629b2cc4..9fefd8fc4 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; diff --git a/src/fauxton/app/addons/documents/templates/changes.html b/src/fauxton/app/addons/documents/templates/changes.html index 460ff74aa..8b598d2b7 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"> diff --git a/src/fauxton/app/addons/documents/views.js b/src/fauxton/app/addons/documents/views.js index 7892d182c..bae49c0cd 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(); |