Return-Path: X-Original-To: apmail-couchdb-commits-archive@www.apache.org Delivered-To: apmail-couchdb-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 9468CCE31 for ; Mon, 9 Sep 2013 13:19:21 +0000 (UTC) Received: (qmail 27882 invoked by uid 500); 9 Sep 2013 13:19:19 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 27637 invoked by uid 500); 9 Sep 2013 13:19:17 -0000 Mailing-List: contact commits-help@couchdb.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@couchdb.apache.org Delivered-To: mailing list commits@couchdb.apache.org Received: (qmail 27466 invoked by uid 99); 9 Sep 2013 13:19:12 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 09 Sep 2013 13:19:12 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 873AB903CC7; Mon, 9 Sep 2013 13:19:12 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: deathbear@apache.org To: commits@couchdb.apache.org Date: Mon, 09 Sep 2013 13:19:13 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [03/10] git commit: updated refs/heads/1807-Replication to 38970f1 More Json Pretty print fixes. Css fixes for documents. Make code editor height size of page. Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/98dfd62b Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/98dfd62b Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/98dfd62b Branch: refs/heads/1807-Replication Commit: 98dfd62b0b29077f175c01fe6abb5ca9dcb7ecda Parents: 04716fc Author: suelockwood Authored: Thu Sep 5 16:39:23 2013 -0400 Committer: suelockwood Committed: Fri Sep 6 10:45:14 2013 -0400 ---------------------------------------------------------------------- src/fauxton/app/modules/documents/views.js | 1 + src/fauxton/app/templates/documents/index_row_tabular.html | 4 ++-- src/fauxton/assets/less/fauxton.less | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb/blob/98dfd62b/src/fauxton/app/modules/documents/views.js ---------------------------------------------------------------------- diff --git a/src/fauxton/app/modules/documents/views.js b/src/fauxton/app/modules/documents/views.js index d43f06c..8f9af49 100644 --- a/src/fauxton/app/modules/documents/views.js +++ b/src/fauxton/app/modules/documents/views.js @@ -725,6 +725,7 @@ function(app, FauxtonAPI, Documents, pouchdb, Codemirror, JSHint, resizeColumns) "Ctrl-/": "undo" } }); + setTimeout(function(){that.editor.setSize(null,$('#dashboard').outerHeight()-250);},200); } }); http://git-wip-us.apache.org/repos/asf/couchdb/blob/98dfd62b/src/fauxton/app/templates/documents/index_row_tabular.html ---------------------------------------------------------------------- diff --git a/src/fauxton/app/templates/documents/index_row_tabular.html b/src/fauxton/app/templates/documents/index_row_tabular.html index f211f9e..f5f68fa 100644 --- a/src/fauxton/app/templates/documents/index_row_tabular.html +++ b/src/fauxton/app/templates/documents/index_row_tabular.html @@ -15,11 +15,11 @@ the License.
- 
<%= JSON.stringify(doc.get("key")) %>
+ 
<%- JSON.stringify(doc.get("key")) %>
- 
<%= JSON.stringify(doc.get("value")) %>
+ 
<%- JSON.stringify(doc.get("value")) %>
http://git-wip-us.apache.org/repos/asf/couchdb/blob/98dfd62b/src/fauxton/assets/less/fauxton.less ---------------------------------------------------------------------- diff --git a/src/fauxton/assets/less/fauxton.less b/src/fauxton/assets/less/fauxton.less index 02fcef6..185113e 100644 --- a/src/fauxton/assets/less/fauxton.less +++ b/src/fauxton/assets/less/fauxton.less @@ -371,7 +371,8 @@ a:hover{ /*dashboard content can be in multiple templates*/ #dashboard-content{ - &.row-fluid{ + &.row-fluid, + &.window-resizeable{ /*remove gutter without rewriting variable*/ margin-left: 0px; }