couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From deathb...@apache.org
Subject [1/3] git commit: updated refs/heads/master to 8c8e5a4
Date Fri, 06 Sep 2013 16:39:29 GMT
Updated Branches:
  refs/heads/master 04716fc7e -> 8c8e5a467


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/master
Commit: 98dfd62b0b29077f175c01fe6abb5ca9dcb7ecda
Parents: 04716fc
Author: suelockwood <deathbearbrown@gmail.com>
Authored: Thu Sep 5 16:39:23 2013 -0400
Committer: suelockwood <deathbearbrown@gmail.com>
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.
 <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>

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;
   }


Mime
View raw message