Continued styles and text tidying

app/addons/components/assets/less/bulk-selector.less

@@ -81,6 +81,7 @@
  margin-top: 1px;
  }
 
+
  .separator {
  border-left: 1px solid @darkBorder;
  margin: 5px 0;
@@ -93,6 +94,9 @@
  font-size: 8px;
  color: #505050;
  padding: 3px 0;
+ &:hover {
+ color: @dangerRed;
+ }
  }
 
  }

app/addons/components/assets/less/header-togglebutton.less

@@ -52,7 +52,7 @@
 
 .header-control-box:hover {
  .icon, span {
- color: @linkColor;
+ color: @hoverHighlight;
  }
 }
 

app/addons/components/components/beautify.js

@@ -50,9 +50,9 @@ export const Beautify = React.createClass({
  className="beautify beautify_map btn btn-primary btn-small beautify-tooltip"
  type="button"
  data-toggle="tooltip"
- title="Reformat your minified code to make edits to it."
+ title="Switch to editable code format."
  >
- beautify this code
+ Format Code
  </button>
  );
  }

app/addons/components/components/confirmbutton.js

@@ -30,7 +30,7 @@ export const ConfirmButton = React.createClass({
  disabled: false,
  showIcon: true,
  customIcon: 'fonticon-ok-circled',
- buttonType: 'btn-success',
+ buttonType: 'btn-primary',
  style: {},
  'data-id': null,
  onClick () { }

app/addons/config/assets/less/config.less

@@ -37,22 +37,11 @@
  }
 
  button { width: 7%;}
-
- transition: background-color 100ms;
-}
-
-.config-item:hover {
- background-color: #e0e0e0;
-}
-
-.config.table-striped tbody > tr.config-item:nth-child(odd) > td,
-.config.table-striped tbody > tr.config-item:nth-child(odd) > th {
  transition: background-color 100ms;
 }
 
-.config.table-striped tbody > tr.config-item:nth-child(odd):hover > td,
-.config.table-striped tbody > tr.config-item:nth-child(odd):hover > th {
- background-color: #e7e7e7;
+.config-item-trash:hover {
+ color: @dangerRed;
 }
 
 .config-item-deleting {

app/addons/config/components.react.jsx

@@ -199,7 +199,7 @@ var ConfigOptionValue = React.createClass({
  return (
  <span>
  <button
- className="btn btn-success fonticon-ok-circled btn-small btn-config-save"
+ className="btn btn-primary fonticon-ok-circled btn-small btn-config-save"
  onClick={this.onSave}
  />
  <button

app/addons/config/tests/componentsSpec.react.jsx

@@ -200,7 +200,7 @@ describe('Config Components', function () {
  );
 
  TestUtils.Simulate.click($(ReactDOM.findDOMNode(el))[0]);
- TestUtils.Simulate.click($('div.confirmation-modal button.btn-success')[0]);
+ TestUtils.Simulate.click($('div.confirmation-modal button.btn-primary')[0]);
  assert.ok(spy.calledOnce);
  });
  });

app/addons/cors/assets/less/cors.less

@@ -124,7 +124,7 @@
  }
 
  tr a:hover {
- color: @linkColor;
+ color: @hoverHighlight;
  }
 
  .edit-domain-section {

app/addons/cors/components.react.jsx

@@ -98,12 +98,12 @@ var OriginRow = React.createClass({
  </td>
  <td width="30">
  <span>
- <a className="fonticon-pencil" onClick={this.editOrigin} title="Click to edit" />
+ <a className="fonticon-pencil" onClick={this.editOrigin} title="Edit domain." />
  </span>
  </td>
  <td width="30">
  <span>
- <a href="#" data-bypass="true" className="fonticon-trash" onClick={this.deleteOrigin} title="Click to delete" />
+ <a href="#" data-bypass="true" className="fonticon-trash" onClick={this.deleteOrigin} title="Delete domain." />
  </span>
  </td>
  </tr>

app/addons/documents/mango/mango.components.react.jsx

@@ -177,7 +177,7 @@ var MangoEditor = React.createClass({
 
  return (
  <PaddedBorderedBox>
- <strong>Your available Indexes:</strong>
+ <strong>Queryable indexes:</strong>
  <a className="edit-link" href={'#' + FauxtonAPI.urls('mango', 'index-app', encodeURIComponent(this.props.dbName))}>edit</a>
  <pre
  className="mango-available-indexes">

app/addons/documents/sidebar/sidebar.react.jsx

@@ -636,7 +636,7 @@ var CloneIndexModal = React.createClass({
  <div className="clone-index-name-row">
  <label className="new-index-title-label" htmlFor="new-index-name">{this.props.indexLabel} Name</label>
  <input type="text" id="new-index-name" value={this.props.newIndexName} onChange={this.setNewIndexName}
- placeholder="Enter new view name" />
+ placeholder="New view name" />
  </div>
  </form>
 

app/addons/documents/tests/nightwatch/deletesDocuments.js

@@ -107,7 +107,7 @@ module.exports = {
  .url(baseUrl + '#/database/' + newDatabaseName + '/' + newDocumentName)
  .waitForElementPresent('#editor-container', waitTime, false)
  .clickWhenVisible('#doc-editor-actions-panel button[title="Delete"]')
- .clickWhenVisible('.confirmation-modal button.btn.btn-success')
+ .clickWhenVisible('.confirmation-modal button.btn.btn-primary')
  .waitForElementPresent('.jump-to-doc', waitTime, false)
 
  //check raw JSON

app/addons/documents/tests/nightwatch/viewDelete.js

@@ -32,8 +32,8 @@ module.exports = {
 
  .clickWhenVisible('.index-list .active span', waitTime, true)
  .clickWhenVisible('.popover-content .fonticon-trash', waitTime, true)
- .waitForElementVisible('.confirmation-modal button.btn-success', waitTime, true)
- .clickWhenVisible('.confirmation-modal button.btn-success', waitTime, true)
+ .waitForElementVisible('.confirmation-modal button.btn-primary', waitTime, true)
+ .clickWhenVisible('.confirmation-modal button.btn-primary', waitTime, true)
 
 
  // now wait for the sidebar to have removed the design doc

app/addons/fauxton/components.react.jsx

@@ -158,7 +158,7 @@ var ConfirmationModal = React.createClass({
  title: 'Please confirm',
  text: '',
  successButtonLabel: 'Okay',
- buttonClass: 'btn-success',
+ buttonClass: 'btn-primary',
  onClose: function () { },
  onSubmit: function () { }
  };

app/addons/replication/assets/less/replication.less

@@ -249,7 +249,7 @@ input.replication__bulk-select-input[type="checkbox"] {
  margin: 8px;
 }
 
-.replication__bulk-select-trash {
+.bulk-select-trash {
  color: #505050;
  border: 1px solid #aaa;
  background-color: rgba(0, 0, 0, 0);

app/addons/replication/components/common-table.js

@@ -228,7 +228,7 @@ const BulkSelectHeader = ({isSelected, deleteDocs, someDocsSelected, onCheck}) =
  const trash = someDocsSelected ?
  <button
  onClick={() => deleteDocs()}
- className="replication__bulk-select-trash fonticon fonticon-trash"
+ className="bulk-select-trash fonticon fonticon-trash"
  title="Delete all selected">
  </button> : null;
 

app/addons/setup/assets/less/setup.less

@@ -28,8 +28,7 @@
  h2 {
  font-size: 16px;
  line-height: normal;
- margin: 0;
- text-transform: uppercase;
+ margin: 10px 0;
  }
 
  .node-item {

app/addons/setup/setup.react.jsx

@@ -38,27 +38,26 @@ var ClusterConfiguredScreen = React.createClass({
 var SetupCurrentAdminPassword = React.createClass({
 
  render: function () {
- var text = 'Your current Admin Username & Password';
+ var text = 'Specify your Admin credentials';
 
  if (this.props.adminParty) {
- text = 'Admin Username & Password that you want to use';
+ text = 'Create Admin credentials.';
  }
 
  return (
  <div className="setup-creds">
  <div>
- <h2>Specify Credentials</h2>
- {text}
+ <p>{text}</p>
  </div>
  <input
  className="setup-username"
  onChange={this.props.onAlterUsername}
- placeholder="Admin Username"
+ placeholder="Username"
  type="text" />
  <input
  className="setup-password"
  onChange={this.props.onAlterPassword}
- placeholder="Admin Password"
+ placeholder="Password"
  type="password" />
  </div>
  );
@@ -89,19 +88,16 @@ var SetupOptionalSettings = React.createClass({
  render: function () {
  return (
  <div className="setup-opt-settings">
- <h2>IP</h2>
- Bind address to listen on<br/>
-
+ <p>Bind address the node will listen on</p>
  <input
  className="setup-input-ip"
  value={this.state.ipValue}
  onChange={this.handleIpChange}
- defaultValue="0.0.0.0"
+ placeholder="IP Address"
  type="text" />
 
  <div className="setup-port">
- <h2>Port</h2>
- Port that the Node uses <br/>
+ <p>Port that the node will use</p>
  <input
  className="setup-input-port"
  value={this.state.portValue}
@@ -206,14 +202,14 @@ var SetupMultipleNodesController = React.createClass({
  </div>
  <hr/>
  <div className="setup-add-nodes-section">
- <h2>Add Nodes</h2>
- Remote host <br/>
+ <h2>Add Nodes to the Cluster</h2>
+ <p>Remote host</p>
  <input
  value={this.state.remoteAddress}
  onChange={this.alterRemoteAddressAdditionalNode}
  className="input-remote-node"
  type="text"
- placeholder="127.0.0.1" />
+ placeholder="IP Address" />
 
  <SetupOptionalSettings
  onAlterPort={this.alterPortAdditionalNode}

app/addons/verifyinstall/components.react.jsx

@@ -64,7 +64,7 @@ var VerifyInstallButton = React.createClass({
 
  render: function () {
  return (
- <button id="start" className="btn btn-success" onClick={this.props.verify} disabled={this.props.isVerifying}>
+ <button id="start" className="btn btn-primary" onClick={this.props.verify} disabled={this.props.isVerifying}>
  {this.props.isVerifying ? 'Verifying' : 'Verify Installation'}
  </button>
  );

assets/less/bootstrap/dropdowns.less

@@ -49,8 +49,8 @@
  min-width: 160px;
  margin: 2px 0 0; // override default ul
  list-style: none;
- background-color: #564E4C;
- color: #B3B4B4;
+ background-color: @brandDark1;
+ color: @navIconColor;
  border: 1px solid #ccc; // Fallback for IE7-8
  border: 1px solid @dropdownBorder;
  *border-right-width: 2px;
@@ -65,7 +65,7 @@
  left: auto;
  }
  li.header-label{
- background-color: #3A2C2B;
+ background-color: @brandDark2;
  color: #FFFFFF;
  padding: 3px 20px;
  font-size: 13px;

assets/less/fauxton.less

@@ -81,6 +81,7 @@ a:active {
 
 a:hover {
  color: @linkColorHover;
+ text-decoration: none;
 }
 
 /* bootstrap overrides */
@@ -155,7 +156,7 @@ table tr td{
  }
 }
 thead {
- border-bottom: 2px solid @brandHighlight;
+ border-bottom: 2px solid #333;
 }
 tbody {
  padding-top: 10px;
@@ -189,11 +190,11 @@ table.databases {
  text-shadow: none;
  .box-shadow(0px 4px 0px rgba(0,0,0,0.45));
  .border-radius(0);
- border-bottom: 1px solid #3a2c2b;
+ border-bottom: 1px solid @brandDark2;
  box-shadow: 0 4px 0 0 rgba(0, 0, 0, 0.4);
  a, a:hover {
  color: #cecece;
- text-decoration: underline;
+ text-decoration: none;
  }
  a.js-dismiss {
  color: rgba(255, 255, 255, 1);