couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From robertkowal...@apache.org
Subject fauxton commit: updated refs/heads/master to 2ece992
Date Tue, 29 Jul 2014 21:03:13 GMT
Repository: couchdb-fauxton
Updated Branches:
  refs/heads/master 5d4732509 -> 2ece99263


Trash can aligned correnctly

Closes COUCHDB-2279


Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/2ece9926
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/2ece9926
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/2ece9926

Branch: refs/heads/master
Commit: 2ece99263d8dd58115066b8c82226677273db293
Parents: 5d47325
Author: Luis Gerhorst <luis@luisgerhorst.de>
Authored: Sun Jul 27 13:12:17 2014 +0200
Committer: Robert Kowalski <rok@kowalski.gd>
Committed: Tue Jul 29 22:55:53 2014 +0200

----------------------------------------------------------------------
 app/addons/documents/assets/less/documents.less | 4 ++++
 app/addons/documents/templates/code_editor.html | 6 ++----
 2 files changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/2ece9926/app/addons/documents/assets/less/documents.less
----------------------------------------------------------------------
diff --git a/app/addons/documents/assets/less/documents.less b/app/addons/documents/assets/less/documents.less
index 13bd4fc..2b29744 100644
--- a/app/addons/documents/assets/less/documents.less
+++ b/app/addons/documents/assets/less/documents.less
@@ -94,6 +94,10 @@ button.beautify {
     font-size: 16px;
 }
 
+#doc-actions {
+	height: 42px;
+}
+
 #editor-container {
     width: 1316px;
     height: 688px;

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/2ece9926/app/addons/documents/templates/code_editor.html
----------------------------------------------------------------------
diff --git a/app/addons/documents/templates/code_editor.html b/app/addons/documents/templates/code_editor.html
index 76d37ef..977bacf 100644
--- a/app/addons/documents/templates/code_editor.html
+++ b/app/addons/documents/templates/code_editor.html
@@ -15,7 +15,7 @@ the License.
 <div id="doc">
   <div class="errors-container"></div>
    
-<div class="nav">
+<div id="doc-actions" class="nav">
   <div class="span3">
     <button class="save-doc btn btn-success save" type="button"><i class="icon fonticon-ok-circled"></i>
Save</button>
     <button class="btn cancel-button">Back to _all_docs</button>
@@ -42,11 +42,9 @@ the License.
     <% } %> 
     <button class="btn upload"><i class="icon icon-circle-arrow-up"></i>
Upload Attachment</button>
     <button class="btn duplicate"><i class="icon icon-repeat"></i> Clone
document</button>
+    <button class="btn btn-danger delete"><i class="icon icon-trash"></i></button>
   </div>
 
-  <button class="btn btn-danger delete"><i class="icon icon-trash"></i></button>
-  </ul>
-
 <div id="upload-modal"> </div>
 <div id="duplicate-modal"> </div> 
 <div id="string-edit-modal"> </div> 


Mime
View raw message