summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsuelockwood <deathbearbrown@gmail.com>2013-09-05 16:39:23 -0400
committersuelockwood <deathbearbrown@gmail.com>2013-09-06 10:45:14 -0400
commit98dfd62b0b29077f175c01fe6abb5ca9dcb7ecda (patch)
tree86f4cc5e15f51723e85fd200d2e26913f8bf834d
parent04716fc7e2c43ff7decf63facd69e07fc9ae476c (diff)
downloadcouchdb-98dfd62b0b29077f175c01fe6abb5ca9dcb7ecda.tar.gz
More Json Pretty print fixes. Css fixes for documents. Make code editor height size of page.
-rw-r--r--src/fauxton/app/modules/documents/views.js1
-rw-r--r--src/fauxton/app/templates/documents/index_row_tabular.html4
-rw-r--r--src/fauxton/assets/less/fauxton.less3
3 files changed, 5 insertions, 3 deletions
diff --git a/src/fauxton/app/modules/documents/views.js b/src/fauxton/app/modules/documents/views.js
index d43f06c88..8f9af4911 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);
}
});
diff --git a/src/fauxton/app/templates/documents/index_row_tabular.html b/src/fauxton/app/templates/documents/index_row_tabular.html
index f211f9eb0..f5f68fa78 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.
<td class="select"><input type="checkbox"></td>
<td>
<div>
- <pre class="prettyprint"><%= JSON.stringify(doc.get("key")) %></pre>
+ <pre class="prettyprint"><%- JSON.stringify(doc.get("key")) %></pre>
</div>
</td>
<td>
<div>
- <pre class="prettyprint"><%= JSON.stringify(doc.get("value")) %></pre>
+ <pre class="prettyprint"><%- JSON.stringify(doc.get("value")) %></pre>
</div>
</td>
diff --git a/src/fauxton/assets/less/fauxton.less b/src/fauxton/assets/less/fauxton.less
index 02fcef6e1..185113eb8 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;
}