diff options
author | suelockwood <deathbearbrown@gmail.com> | 2013-09-20 11:55:51 -0400 |
---|---|---|
committer | suelockwood <deathbearbrown@gmail.com> | 2013-09-20 11:55:51 -0400 |
commit | f71431192c09c773d69e2cf551490a932267711c (patch) | |
tree | 6f455c1c33bdb0544674fa58068852bbe5a7cef6 | |
parent | 5f99ec2c793816a921f8795cde1c729f32e9dcdf (diff) | |
download | couchdb-f71431192c09c773d69e2cf551490a932267711c.tar.gz |
Fix all the buttons to have consistent styling.
5 files changed, 13 insertions, 13 deletions
diff --git a/src/fauxton/app/modules/documents/views.js b/src/fauxton/app/modules/documents/views.js index c70e94e19..02abff7ff 100644 --- a/src/fauxton/app/modules/documents/views.js +++ b/src/fauxton/app/modules/documents/views.js @@ -798,7 +798,7 @@ function(app, FauxtonAPI, Components, Documents, pouchdb, Codemirror, JSHint, re "Ctrl-/": "undo" } }); - setTimeout(function(){that.editor.setSize(null,$('#dashboard').outerHeight()-250);},200); + setTimeout(function(){that.editor.setSize(null,$('#dashboard').outerHeight()-295);},200); } }); diff --git a/src/fauxton/app/templates/documents/doc_field_editor.html b/src/fauxton/app/templates/documents/doc_field_editor.html index c9ce32b43..77d92781c 100644 --- a/src/fauxton/app/templates/documents/doc_field_editor.html +++ b/src/fauxton/app/templates/documents/doc_field_editor.html @@ -21,8 +21,8 @@ the License. <button class="btn btn-small new" style="margin-left: 64px"><i class="icon-plus"></i> New field</button> </div> <div class="btn-toolbar pull-right"> - <button class="btn btn-small cancel">Cancel</button> - <button class="btn btn-small save">Save</button> + <button class="btn btn-small cancel button cancel-button outlineGray fonticon-circle-x">Cancel</button> + <button class="btn btn-small save button green fonticon-circle-check">Save</button> </div> </div> diff --git a/src/fauxton/app/templates/documents/duplicate_doc_modal.html b/src/fauxton/app/templates/documents/duplicate_doc_modal.html index dba8d44b8..3f374b65a 100644 --- a/src/fauxton/app/templates/documents/duplicate_doc_modal.html +++ b/src/fauxton/app/templates/documents/duplicate_doc_modal.html @@ -28,8 +28,8 @@ the License. </div> <div class="modal-footer"> - <a href="#" data-dismiss="modal" class="btn">Cancel</a> - <a href="#" id="duplicate-btn" class="btn btn-primary">Duplicate</a> + <a href="#" data-dismiss="modal" class="btn button cancel-button outlineGray fonticon-circle-x">Cancel</a> + <a href="#" id="duplicate-btn" class="btn btn-primary button green save fonticon-circle-check">Duplicate</a> </div> </div> diff --git a/src/fauxton/app/templates/documents/upload_modal.html b/src/fauxton/app/templates/documents/upload_modal.html index 33c28617e..05f129c63 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">Cancel</a> - <a href="#" id="upload-btn" class="btn btn-primary">Upload</a> + <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> </div> </div> diff --git a/src/fauxton/assets/less/fauxton.less b/src/fauxton/assets/less/fauxton.less index 82e0a14f8..4255a1e29 100644 --- a/src/fauxton/assets/less/fauxton.less +++ b/src/fauxton/assets/less/fauxton.less @@ -590,12 +590,6 @@ tbody {padding-top: 10px;} background-image: none; text-shadow: none; } - button{ - - } - .dropdown-menu{ - - } } .btn { @@ -620,6 +614,12 @@ tbody {padding-top: 10px;} } } +a.button, a.button:visited, a.button:active { + &.cancel-button{ + color: @fontGrey; + } +} + .select{ > a{ display: block; |