Repository: couchdb-fauxton Updated Branches: refs/heads/master 78ec2a613 -> 8b7f7e3a4
Fix for missing label for Map Function on Edit View page This also tweaks the CSS to remove some excess margin. Closes COUCHDB-2690 PR: #420 PR-URL: https://github.com/apache/couchdb-fauxton/pull/420 Reviewed-By: Robert Kowalski <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/8b7f7e3a Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/8b7f7e3a Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/8b7f7e3a Branch: refs/heads/master Commit: 8b7f7e3a4ef8730447727d6a2b9f8741aea8f6fa Parents: 78ec2a6 Author: Ben Keen <[email protected]> Authored: Fri May 15 12:35:10 2015 -0700 Committer: Robert Kowalski <[email protected]> Committed: Mon May 18 11:57:04 2015 +0200 ---------------------------------------------------------------------- app/addons/components/react-components.react.jsx | 3 ++- app/addons/documents/assets/less/view-editor.less | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/8b7f7e3a/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 78332c2..6a4f680 100644 --- a/app/addons/components/react-components.react.jsx +++ b/app/addons/components/react-components.react.jsx @@ -86,7 +86,8 @@ function (app, FauxtonAPI, React, Components, ace, beautifyHelper) { }, setupAce: function (props, shouldUpdateCode) { - var el = this.getDOMNode(this.refs.ace); + var el = this.refs.ace.getDOMNode(); + //set the id so our nightwatch tests can find it el.id = props.id; http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/8b7f7e3a/app/addons/documents/assets/less/view-editor.less ---------------------------------------------------------------------- diff --git a/app/addons/documents/assets/less/view-editor.less b/app/addons/documents/assets/less/view-editor.less index 0afd29f..fa2d358 100644 --- a/app/addons/documents/assets/less/view-editor.less +++ b/app/addons/documents/assets/less/view-editor.less @@ -45,9 +45,13 @@ margin-top: 25px; height: 46px; } +} +body .view-query-save .control-group { + margin-bottom: 0; } + // 940px grid without margin // ------------------------- @gridColumnWidthNoMargin: 60px;
