Wrap rows in sk-panel-row, 1.2.5

standardnotes · Jan 4, 2019 · 1d496db · 1d496db
1 parent 8aee72e
commit 1d496db
Show file tree

Hide file tree

Showing 5 changed files with 92 additions and 80 deletions.
diff --git a/app/components/IntegrationsView.js b/app/components/IntegrationsView.js
@@ -127,17 +127,19 @@ export default class IntegrationsView extends React.Component {
 
         <div>
           {this.state.integrations.map((integration) =>
-            <div className="sk-horizontal-group">
-              <div>
-                <span className={integration.content.isDefaultUploadSource ? "bold" : undefined}>{this.displayStringForIntegration(integration)}</span>
-                {integration.content.isDefaultUploadSource &&
-                  <span> (Default)</span>
+            <div className="sk-panel-row">
+              <div className="sk-horizontal-group">
+                <div>
+                  <span className={integration.content.isDefaultUploadSource ? "bold" : undefined}>{this.displayStringForIntegration(integration)}</span>
+                  {integration.content.isDefaultUploadSource &&
+                    <span> (Default)</span>
+                  }
+                </div>
+                {hasMultipleIntegrations && !integration.content.isDefaultUploadSource &&
+                  <a className="info" onClick={() => {this.setIntegrationAsDefaultUploadSource(integration)}}>Make Default</a>
                 }
+                <a className="danger" onClick={() => {this.deleteIntegration(integration)}}>Delete</a>
               </div>
-              {hasMultipleIntegrations && !integration.content.isDefaultUploadSource &&
-                <a className="info" onClick={() => {this.setIntegrationAsDefaultUploadSource(integration)}}>Make Default</a>
-              }
-              <a className="danger" onClick={() => {this.deleteIntegration(integration)}}>Delete</a>
             </div>
           )}
         </div>

diff --git a/app/components/KeysView.js b/app/components/KeysView.js
@@ -62,17 +62,19 @@ export default class KeysView extends React.Component {
 
         <div>
           {this.state.credentials.map((credential) =>
-            <div className="sk-horizontal-group">
-              <div className={credential.content.isDefault ? "bold" : undefined}>{this.labelForCredential(credential)}</div>
-              {credential.content.isDefault &&
-                <span> (Default)</span>
+            <div className="sk-panel-row">
+              <div className="sk-horizontal-group">
+                <div className={credential.content.isDefault ? "bold" : undefined}>{this.labelForCredential(credential)}</div>
+                {credential.content.isDefault &&
+                  <span> (Default)</span>
+                }
+              {this.state.credentials.length > 1 && !credential.content.isDefault &&
+                <a className="info" onClick={() => {this.setCredentialAsDefault(credential)}}>Make Default</a>
               }
-            {this.state.credentials.length > 1 && !credential.content.isDefault &&
-              <a className="info" onClick={() => {this.setCredentialAsDefault(credential)}}>Make Default</a>
-            }
-              <div>({this.numFilesForCredential(credential)} encrypted files)</div>
-              <a className="info" onClick={() => {this.exportCredential(credential)}}>Export</a>
-              <a className="danger" onClick={() => {this.deleteCredential(credential)}}>Delete</a>
+                <div>({this.numFilesForCredential(credential)} encrypted files)</div>
+                <a className="info" onClick={() => {this.exportCredential(credential)}}>Export</a>
+                <a className="danger" onClick={() => {this.deleteCredential(credential)}}>Delete</a>
+              </div>
             </div>
           )}
         </div>

diff --git a/dist/dist.js b/dist/dist.js
@@ -12170,44 +12170,48 @@ var KeysView = function (_React$Component) {
           this.state.credentials.map(function (credential) {
             return _react2.default.createElement(
               'div',
-              { className: 'sk-horizontal-group' },
+              { className: 'sk-panel-row' },
               _react2.default.createElement(
                 'div',
-                { className: credential.content.isDefault ? "bold" : undefined },
-                _this2.labelForCredential(credential)
-              ),
-              credential.content.isDefault && _react2.default.createElement(
-                'span',
-                null,
-                ' (Default)'
-              ),
-              _this2.state.credentials.length > 1 && !credential.content.isDefault && _react2.default.createElement(
-                'a',
-                { className: 'info', onClick: function onClick() {
-                    _this2.setCredentialAsDefault(credential);
-                  } },
-                'Make Default'
-              ),
-              _react2.default.createElement(
-                'div',
-                null,
-                '(',
-                _this2.numFilesForCredential(credential),
-                ' encrypted files)'
-              ),
-              _react2.default.createElement(
-                'a',
-                { className: 'info', onClick: function onClick() {
-                    _this2.exportCredential(credential);
-                  } },
-                'Export'
-              ),
-              _react2.default.createElement(
-                'a',
-                { className: 'danger', onClick: function onClick() {
-                    _this2.deleteCredential(credential);
-                  } },
-                'Delete'
+                { className: 'sk-horizontal-group' },
+                _react2.default.createElement(
+                  'div',
+                  { className: credential.content.isDefault ? "bold" : undefined },
+                  _this2.labelForCredential(credential)
+                ),
+                credential.content.isDefault && _react2.default.createElement(
+                  'span',
+                  null,
+                  ' (Default)'
+                ),
+                _this2.state.credentials.length > 1 && !credential.content.isDefault && _react2.default.createElement(
+                  'a',
+                  { className: 'info', onClick: function onClick() {
+                      _this2.setCredentialAsDefault(credential);
+                    } },
+                  'Make Default'
+                ),
+                _react2.default.createElement(
+                  'div',
+                  null,
+                  '(',
+                  _this2.numFilesForCredential(credential),
+                  ' encrypted files)'
+                ),
+                _react2.default.createElement(
+                  'a',
+                  { className: 'info', onClick: function onClick() {
+                      _this2.exportCredential(credential);
+                    } },
+                  'Export'
+                ),
+                _react2.default.createElement(
+                  'a',
+                  { className: 'danger', onClick: function onClick() {
+                      _this2.deleteCredential(credential);
+                    } },
+                  'Delete'
+                )
               )
             );
           })
@@ -14024,34 +14028,38 @@ var IntegrationsView = function (_React$Component) {
           this.state.integrations.map(function (integration) {
             return _react2.default.createElement(
               'div',
-              { className: 'sk-horizontal-group' },
+              { className: 'sk-panel-row' },
               _react2.default.createElement(
                 'div',
-                null,
+                { className: 'sk-horizontal-group' },
                 _react2.default.createElement(
-                  'span',
-                  { className: integration.content.isDefaultUploadSource ? "bold" : undefined },
-                  _this2.displayStringForIntegration(integration)
-                ),
-                integration.content.isDefaultUploadSource && _react2.default.createElement(
-                  'span',
+                  'div',
                   null,
-                  ' (Default)'
+                  _react2.default.createElement(
+                    'span',
+                    { className: integration.content.isDefaultUploadSource ? "bold" : undefined },
+                    _this2.displayStringForIntegration(integration)
+                  ),
+                  integration.content.isDefaultUploadSource && _react2.default.createElement(
+                    'span',
+                    null,
+                    ' (Default)'
+                  )
+                ),
+                hasMultipleIntegrations && !integration.content.isDefaultUploadSource && _react2.default.createElement(
+                  'a',
+                  { className: 'info', onClick: function onClick() {
+                      _this2.setIntegrationAsDefaultUploadSource(integration);
+                    } },
+                  'Make Default'
+                ),
+                _react2.default.createElement(
+                  'a',
+                  { className: 'danger', onClick: function onClick() {
+                      _this2.deleteIntegration(integration);
+                    } },
+                  'Delete'
                 )
-              ),
-              hasMultipleIntegrations && !integration.content.isDefaultUploadSource && _react2.default.createElement(
-                'a',
-                { className: 'info', onClick: function onClick() {
-                    _this2.setIntegrationAsDefaultUploadSource(integration);
-                  } },
-                'Make Default'
-              ),
-              _react2.default.createElement(
-                'a',
-                { className: 'danger', onClick: function onClick() {
-                    _this2.deleteIntegration(integration);
-                  } },
-                'Delete'
               )
             );
           })

diff --git a/dist/dist.min.js b/dist/dist.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "sn-filesafe",
-  "version": "1.2.4",
+  "version": "1.2.5",
   "main": "dist/dist.js",
   "scripts": {
     "lint": "eslint --cache --ignore-path .gitignore --ext .jsx,.js --format=node_modules/eslint-formatter-pretty .",