Css fix for editor buttons
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/96e2a065 Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/96e2a065 Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/96e2a065 Branch: refs/heads/1960-paginate-all_dbs Commit: 96e2a065ae4fa83fbfc772eb3e339a35ba43fb6b Parents: b0bf0f3 Author: suelockwood <[email protected]> Authored: Mon Dec 23 13:47:28 2013 -0500 Committer: suelockwood <[email protected]> Committed: Mon Dec 23 13:47:28 2013 -0500 ---------------------------------------------------------------------- src/fauxton/app/templates/documents/doc.html | 47 ++++++++++++-------- .../app/templates/documents/upload_modal.html | 4 +- src/fauxton/assets/less/database.less | 7 +++ src/fauxton/assets/less/fauxton.less | 4 ++ 4 files changed, 41 insertions(+), 21 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb/blob/96e2a065/src/fauxton/app/templates/documents/doc.html ---------------------------------------------------------------------- diff --git a/src/fauxton/app/templates/documents/doc.html b/src/fauxton/app/templates/documents/doc.html index b4775dd..82f2733 100644 --- a/src/fauxton/app/templates/documents/doc.html +++ b/src/fauxton/app/templates/documents/doc.html @@ -15,26 +15,35 @@ the License. <div id="doc"> <div class="errors-container"></div> -<div class="btn-group" style="margin-bottom: 15px"> - <% if (attachments) { %> - <a class="btn dropdown-toggle btn" data-toggle="dropdown" href="#"> - View Attachments - <span class="caret"></span> - </a> - <ul class="dropdown-menu"> - <%_.each(attachments, function (att) { %> - <li> - <a href="<%= att.url %>" target="_blank"> <strong> <%= att.fileName %> </strong> - - <span> <%= att.contentType %>, <%= formatSize(att.size)%> </span> +<div class="row doc-editor-buttons"> + <div class="span3"> + <button class="save-doc button green btn-large save fonticon-circle-check" type="button">Save</button> + <button class="button cancel-button gray btn-large">Back to _all_docs</button> + </div> + + <div class="span7"> + <% if (attachments) { %> + <div class="btn-group"> + <a class="button gray btn-large dropdown-toggle btn" data-bypass="true" data-toggle="dropdown" href="#"> + View Attachments + <span class="caret"></span> </a> - </li> - <% }) %> - </ul> - - <% } %> - <button class="btn btn-small upload"><i class="icon-circle-arrow-up"></i> Upload Attachment</button> - <button class="btn btn-small duplicate"><i class="icon-repeat"></i> Duplicate document</button> - <button class="btn btn-small delete"><i class="icon-trash"></i> Delete document</button> + <ul class="dropdown-menu"> + <%_.each(attachments, function (att) { %> + <li> + <a href="<%= att.url %>" target="_blank"> <strong> <%= att.fileName %> </strong> - + <span> <%= att.contentType %>, <%= formatSize(att.size)%> </span> + </a> + </li> + <% }) %> + </ul> + </div> + <% } %> + <button class="button gray btn-large upload"><i class="icon-circle-arrow-up"></i> Upload Attachment</button> + <button class="button gray btn-large duplicate"><i class="icon-repeat"></i> Duplicate document</button> + </div> + + <button class="button red btn-large delete"><i class="icon-trash"></i></button> </ul> <div id="upload-modal"> </div> http://git-wip-us.apache.org/repos/asf/couchdb/blob/96e2a065/src/fauxton/app/templates/documents/upload_modal.html ---------------------------------------------------------------------- diff --git a/src/fauxton/app/templates/documents/upload_modal.html b/src/fauxton/app/templates/documents/upload_modal.html index 05f129c..9a5c5cd 100644 --- a/src/fauxton/app/templates/documents/upload_modal.html +++ b/src/fauxton/app/templates/documents/upload_modal.html @@ -35,8 +35,8 @@ the License. </div> </div> <div class="modal-footer"> - <a href="#" data-dismiss="modal" class="btn button cancel-button outlineGray fonticon-circle-x">Cancel</a> - <a href="#" id="upload-btn" class="btn btn-primary button green save fonticon-circle-check">Upload</a> + <a href="#" data-dismiss="modal" data-bypass="true" class="btn button cancel-button outlineGray fonticon-circle-x">Cancel</a> + <a href="#" id="upload-btn" data-bypass="true" class="btn btn-primary button green save fonticon-circle-check">Upload</a> </div> </div> http://git-wip-us.apache.org/repos/asf/couchdb/blob/96e2a065/src/fauxton/assets/less/database.less ---------------------------------------------------------------------- diff --git a/src/fauxton/assets/less/database.less b/src/fauxton/assets/less/database.less index 6f2ae92..377b136 100644 --- a/src/fauxton/assets/less/database.less +++ b/src/fauxton/assets/less/database.less @@ -236,3 +236,10 @@ table#changes-table { } +.doc-editor-buttons { + margin-bottom: 15px; + a.button.btn-large.gray { + padding: 9px 10px; + vertical-align: middle; + } +} http://git-wip-us.apache.org/repos/asf/couchdb/blob/96e2a065/src/fauxton/assets/less/fauxton.less ---------------------------------------------------------------------- diff --git a/src/fauxton/assets/less/fauxton.less b/src/fauxton/assets/less/fauxton.less index d220abc..22594d8 100644 --- a/src/fauxton/assets/less/fauxton.less +++ b/src/fauxton/assets/less/fauxton.less @@ -641,6 +641,10 @@ tbody {padding-top: 10px;} border: 1px solid @orange; } } + &.gray{ + background-color: #ddd; + color: @grayDark; + } &.green{ background-color: @green; }
