couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From benk...@apache.org
Subject [1/9] fauxton commit: updated refs/heads/master to 5b718dd
Date Tue, 17 May 2016 14:58:33 GMT
Repository: couchdb-fauxton
Updated Branches:
  refs/heads/master 906f13852 -> 5b718dd71


Standardizing modal btn order

This standardizes the modal button order: cancel link first,
action button second.


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

Branch: refs/heads/master
Commit: e3443a25a2fbf757c78d7ce4287e648657cd4944
Parents: 906f138
Author: Ben Keen <ben.keen@gmail.com>
Authored: Mon May 16 09:28:34 2016 -0700
Committer: Ben Keen <ben.keen@gmail.com>
Committed: Mon May 16 09:28:34 2016 -0700

----------------------------------------------------------------------
 app/addons/components/assets/less/modals.less        | 2 +-
 app/addons/components/react-components.react.jsx     | 2 +-
 app/addons/documents/doc-editor/components.react.jsx | 4 ++--
 app/addons/documents/sidebar/sidebar.react.jsx       | 2 +-
 app/addons/fauxton/components.react.jsx              | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/e3443a25/app/addons/components/assets/less/modals.less
----------------------------------------------------------------------
diff --git a/app/addons/components/assets/less/modals.less b/app/addons/components/assets/less/modals.less
index 7d51966..fa32141 100644
--- a/app/addons/components/assets/less/modals.less
+++ b/app/addons/components/assets/less/modals.less
@@ -1,7 +1,7 @@
 @import "../../../../../assets/less/variables.less";
 
 .modal .cancel-link {
-  margin: 0 5px 0 15px;
+  margin: 0 15px;
   font-size: 14px;
   color: @defaultText;
   &:hover {

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/e3443a25/app/addons/components/react-components.react.jsx
----------------------------------------------------------------------
diff --git a/app/addons/components/react-components.react.jsx b/app/addons/components/react-components.react.jsx
index bf30b52..3f46b37 100644
--- a/app/addons/components/react-components.react.jsx
+++ b/app/addons/components/react-components.react.jsx
@@ -1541,13 +1541,13 @@ define([
               autoFocus={true} />
           </Modal.Body>
           <Modal.Footer>
+            <a href="#" onClick={this.close} data-bypass="true" className="cancel-link">Cancel</a>
             <button
               disabled={this.state.disableSubmit}
               onClick={this.onDeleteClick}
               className="btn btn-danger delete">
               <i className="icon fonticon-cancel-circled" /> Delete
             </button>
-            <a href="#" onClick={this.close} data-bypass="true" className="cancel-link">Cancel</a>
           </Modal.Footer>
         </Modal>
       );

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/e3443a25/app/addons/documents/doc-editor/components.react.jsx
----------------------------------------------------------------------
diff --git a/app/addons/documents/doc-editor/components.react.jsx b/app/addons/documents/doc-editor/components.react.jsx
index 188e8c5..8062dd7 100644
--- a/app/addons/documents/doc-editor/components.react.jsx
+++ b/app/addons/documents/doc-editor/components.react.jsx
@@ -362,10 +362,10 @@ define([
             </div>
           </Modal.Body>
           <Modal.Footer>
+            <a href="#" data-bypass="true" className="cancel-link" onClick={this.closeModal}>Cancel</a>
             <button href="#" id="upload-btn" data-bypass="true" className="btn btn-success
save" onClick={this.upload}>
               Upload Attachment
             </button>
-            <a href="#" data-bypass="true" className="cancel-link" onClick={this.closeModal}>Cancel</a>
           </Modal.Footer>
         </Modal>
       );
@@ -431,10 +431,10 @@ define([
             </form>
           </Modal.Body>
           <Modal.Footer>
+            <a href="#" data-bypass="true" className="cancel-link" onClick={this.closeModal}>Cancel</a>
             <button className="btn btn-success save" onClick={this.cloneDoc}>
               <i className="fonticon-ok-circled"></i> Clone Document
             </button>
-            <a href="#" data-bypass="true" className="cancel-link" onClick={this.closeModal}>Cancel</a>
           </Modal.Footer>
         </Modal>
       );

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/e3443a25/app/addons/documents/sidebar/sidebar.react.jsx
----------------------------------------------------------------------
diff --git a/app/addons/documents/sidebar/sidebar.react.jsx b/app/addons/documents/sidebar/sidebar.react.jsx
index 53725fe..ce38840 100644
--- a/app/addons/documents/sidebar/sidebar.react.jsx
+++ b/app/addons/documents/sidebar/sidebar.react.jsx
@@ -653,9 +653,9 @@ function (app, FauxtonAPI, React, ReactDOM, Stores, Actions, Components,
Compone
 
           </Modal.Body>
           <Modal.Footer>
+            <a href="#" className="cancel-link" onClick={this.close} data-bypass="true">Cancel</a>
             <button onClick={this.submit} data-bypass="true" className="btn btn-success
save">
               <i className="icon fonticon-ok-circled" /> Clone {this.props.indexLabel}</button>
-            <a href="#" className="cancel-link" onClick={this.close} data-bypass="true">Cancel</a>
           </Modal.Footer>
         </Modal>
       );

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/e3443a25/app/addons/fauxton/components.react.jsx
----------------------------------------------------------------------
diff --git a/app/addons/fauxton/components.react.jsx b/app/addons/fauxton/components.react.jsx
index af5d50f..0ac61da 100644
--- a/app/addons/fauxton/components.react.jsx
+++ b/app/addons/fauxton/components.react.jsx
@@ -407,10 +407,10 @@ function (app, FauxtonAPI, React, ReactDOM, ZeroClipboard, ReactBootstrap)
{
             {content}
           </Modal.Body>
           <Modal.Footer>
+            <a href="#" data-bypass="true" className="cancel-link" onClick={this.close}>Cancel</a>
             <button className={btnClasses} onClick={this.props.onSubmit}>
               <i className="fonticon-ok-circled"></i> {this.props.successButtonLabel}
             </button>
-            <a href="#" data-bypass="true" className="cancel-link" onClick={this.close}>Cancel</a>
           </Modal.Footer>
         </Modal>
       );


Mime
View raw message