You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by ga...@apache.org on 2017/03/21 09:38:50 UTC
[couchdb-fauxton] branch master updated: (#878) - Numerous small
style changes
This is an automated email from the ASF dual-hosted git repository.
garren pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/couchdb-fauxton.git
The following commit(s) were added to refs/heads/master by this push:
new d29ce7f (#878) - Numerous small style changes
d29ce7f is described below
commit d29ce7fe2d7a6274e27bddb49c10ca1a9c17c0ac
Author: Justin McDavid <jm...@us.ibm.com>
AuthorDate: Tue Mar 21 02:38:48 2017 -0700
(#878) - Numerous small style changes
Added icons to buttons that trigger data changes, and removed the icon a button that does not trigger a change to stored data.
Swapped some icons for ones more relevant to the action being performed.
Updated text colors on some replication-related buttons.
Updated hover-colors for some standalone icons.
Changed some button text to "Verb Direct_Object" format.
---
app/addons/auth/components.react.jsx | 4 ++--
app/addons/components/components/deletedatabasemodal.js | 2 +-
app/addons/documents/assets/less/sidenav.less | 4 ++--
app/addons/documents/doc-editor/components.react.jsx | 2 +-
app/addons/documents/queryoptions/queryoptions.react.jsx | 5 +----
app/addons/replication/assets/less/replication.less | 2 ++
app/addons/replication/components/modals.js | 4 ++--
assets/less/notification-center.less | 3 +--
8 files changed, 12 insertions(+), 14 deletions(-)
diff --git a/app/addons/auth/components.react.jsx b/app/addons/auth/components.react.jsx
index 9446201..f0e4426 100644
--- a/app/addons/auth/components.react.jsx
+++ b/app/addons/auth/components.react.jsx
@@ -163,7 +163,7 @@ var ChangePasswordForm = React.createClass({
<br />
<p>
- <button type="submit" className="btn btn-primary">Change</button>
+ <button type="submit" className="btn btn-primary"><i className="icon icon-ok-circle" /> Change Password</button>
</p>
</form>
</div>
@@ -247,7 +247,7 @@ var CreateAdminForm = React.createClass({
are controlled by validation functions. CouchDB can be configured to block all
access to anonymous users.
</p>
- <button type="submit" id="create-admin" className="btn btn-primary">Create Admin</button>
+ <button type="submit" id="create-admin" className="btn btn-primary"><i className="icon icon-ok-circle" /> Create Admin</button>
</form>
</div>
);
diff --git a/app/addons/components/components/deletedatabasemodal.js b/app/addons/components/components/deletedatabasemodal.js
index f24e553..74bc273 100644
--- a/app/addons/components/components/deletedatabasemodal.js
+++ b/app/addons/components/components/deletedatabasemodal.js
@@ -110,7 +110,7 @@ export const DeleteDatabaseModal = React.createClass({
disabled={this.state.disableSubmit}
onClick={this.onDeleteClick}
className="btn btn-danger delete">
- <i className="icon fonticon-cancel-circled" /> Delete
+ <i className="icon icon-trash" /> Delete
</button>
</Modal.Footer>
</Modal>
diff --git a/app/addons/documents/assets/less/sidenav.less b/app/addons/documents/assets/less/sidenav.less
index fb46c22..e8f75bc 100644
--- a/app/addons/documents/assets/less/sidenav.less
+++ b/app/addons/documents/assets/less/sidenav.less
@@ -16,7 +16,7 @@
#sidebar-content {
.loading-lines {
margin-top: 20px;
- }
+ }
}
.sidenav {
@@ -35,7 +35,7 @@
}
.dropdown-toggle:hover {
- color: @linkColor;
+ color: #E73D34;
}
// ugly! This styles the (+) icon to make it white when a user hovers over a row. Better solution would be to move the
diff --git a/app/addons/documents/doc-editor/components.react.jsx b/app/addons/documents/doc-editor/components.react.jsx
index 9c24396..88fd38a 100644
--- a/app/addons/documents/doc-editor/components.react.jsx
+++ b/app/addons/documents/doc-editor/components.react.jsx
@@ -364,7 +364,7 @@ var UploadModal = React.createClass({
<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
+ <i className="icon icon-upload" /> Upload Attachment
</button>
</Modal.Footer>
</Modal>
diff --git a/app/addons/documents/queryoptions/queryoptions.react.jsx b/app/addons/documents/queryoptions/queryoptions.react.jsx
index 553373a..5b38cbc 100644
--- a/app/addons/documents/queryoptions/queryoptions.react.jsx
+++ b/app/addons/documents/queryoptions/queryoptions.react.jsx
@@ -272,10 +272,7 @@ var QueryButtons = React.createClass({
return (
<div className="controls-group query-group">
<div id="button-options" className="controls controls-row">
- <button type="submit" className="btn btn-success">
- <i className="fonticon-play icon" />
- Run Query
- </button>
+ <button type="submit" className="btn btn-success">Run Query</button>
<a onClick={this.hideTray} className="btn btn-cancel">Cancel</a>
</div>
</div>
diff --git a/app/addons/replication/assets/less/replication.less b/app/addons/replication/assets/less/replication.less
index 828749e..0936622 100644
--- a/app/addons/replication/assets/less/replication.less
+++ b/app/addons/replication/assets/less/replication.less
@@ -305,11 +305,13 @@ button.replication__error-continue {
.replication__error-cancel,
.replication__error-continue {
background-color: #0082BF;
+ color: #FFF;
}
.replication__error-cancel:hover,
.replication__error-continue:hover {
background-color: #e73d34;
+ color: #FFF;
}
td.replication__empty-row {
diff --git a/app/addons/replication/components/modals.js b/app/addons/replication/components/modals.js
index 9ef7c96..abde490 100644
--- a/app/addons/replication/components/modals.js
+++ b/app/addons/replication/components/modals.js
@@ -30,7 +30,7 @@ export const DeleteModal = ({
let header = "";
let btnText = `Delete ${isReplicationDB ? 'Document' : 'Replication Job'}`;
- let infoSection = `Deleting a replication ${isReplicationDB ? 'document' : 'job'} stops continuous replication
+ let infoSection = `Deleting a replication ${isReplicationDB ? 'document' : 'job'} stops continuous replication
and incomplete one-time replication, but does not affect replicated documents.`;
if (multipleDocs > 1) {
@@ -137,7 +137,7 @@ export const ConflictModal = ({visible, docId, onClose, onClick}) => {
Change Document ID
</button>
<button onClick={onClick} className="btn replication__error-continue">
- Overwrite Existing Document
+ <i className="icon icon-eraser" /> Overwrite Existing Document
</button>
</Modal.Footer>
</Modal>
diff --git a/assets/less/notification-center.less b/assets/less/notification-center.less
index ae60641..4ced52f 100644
--- a/assets/less/notification-center.less
+++ b/assets/less/notification-center.less
@@ -27,7 +27,7 @@ body #dashboard #notification-center-btn {
padding: 17px 16px 16px;
}
&:hover {
- color: @darkRed;
+ color: #E73D34;
}
}
@@ -233,4 +233,3 @@ body #dashboard #notification-center-btn {
0% { max-height: 1000px; }
100% { max-height:0; }
}
-
--
To stop receiving notification emails like this one, please contact
['"commits@couchdb.apache.org" <co...@couchdb.apache.org>'].