couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From deathb...@apache.org
Subject git commit: updated refs/heads/master to f714311
Date Fri, 20 Sep 2013 16:08:59 GMT
Updated Branches:
  refs/heads/master 5f99ec2c7 -> f71431192


Fix all the buttons to have consistent styling.


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

Branch: refs/heads/master
Commit: f71431192c09c773d69e2cf551490a932267711c
Parents: 5f99ec2
Author: suelockwood <deathbearbrown@gmail.com>
Authored: Fri Sep 20 11:55:51 2013 -0400
Committer: suelockwood <deathbearbrown@gmail.com>
Committed: Fri Sep 20 11:55:51 2013 -0400

----------------------------------------------------------------------
 src/fauxton/app/modules/documents/views.js              |  2 +-
 .../app/templates/documents/doc_field_editor.html       |  4 ++--
 .../app/templates/documents/duplicate_doc_modal.html    |  4 ++--
 src/fauxton/app/templates/documents/upload_modal.html   |  4 ++--
 src/fauxton/assets/less/fauxton.less                    | 12 ++++++------
 5 files changed, 13 insertions(+), 13 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb/blob/f7143119/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 c70e94e..02abff7 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);
     }
   });
 

http://git-wip-us.apache.org/repos/asf/couchdb/blob/f7143119/src/fauxton/app/templates/documents/doc_field_editor.html
----------------------------------------------------------------------
diff --git a/src/fauxton/app/templates/documents/doc_field_editor.html b/src/fauxton/app/templates/documents/doc_field_editor.html
index c9ce32b..77d9278 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>
 

http://git-wip-us.apache.org/repos/asf/couchdb/blob/f7143119/src/fauxton/app/templates/documents/duplicate_doc_modal.html
----------------------------------------------------------------------
diff --git a/src/fauxton/app/templates/documents/duplicate_doc_modal.html b/src/fauxton/app/templates/documents/duplicate_doc_modal.html
index dba8d44..3f374b6 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>
 

http://git-wip-us.apache.org/repos/asf/couchdb/blob/f7143119/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 33c2861..05f129c 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>
 

http://git-wip-us.apache.org/repos/asf/couchdb/blob/f7143119/src/fauxton/assets/less/fauxton.less
----------------------------------------------------------------------
diff --git a/src/fauxton/assets/less/fauxton.less b/src/fauxton/assets/less/fauxton.less
index 82e0a14..4255a1e 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;


Mime
View raw message