You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@superset.apache.org by ma...@apache.org on 2018/12/28 06:18:32 UTC
[incubator-superset] branch master updated: [design] use angle
icons instead of carets for expandable panels (#6564)
This is an automated email from the ASF dual-hosted git repository.
maximebeauchemin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-superset.git
The following commit(s) were added to refs/heads/master by this push:
new 2c3794e [design] use angle icons instead of carets for expandable panels (#6564)
2c3794e is described below
commit 2c3794e28d25c3e49d8a3adc89dbe976b9043ace
Author: Maxime Beauchemin <ma...@gmail.com>
AuthorDate: Thu Dec 27 22:18:27 2018 -0800
[design] use angle icons instead of carets for expandable panels (#6564)
* [design] use angle icons instead of carets for expandable panels
Also moving to the right to conform to the material design specs
* Fix cypress test
---
.../cypress/integration/explore/control.test.js | 1 +
.../src/explore/components/ControlPanelSection.jsx | 24 +++++++++++-----------
2 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/superset/assets/cypress/integration/explore/control.test.js b/superset/assets/cypress/integration/explore/control.test.js
index 68b7a14..36de57d 100644
--- a/superset/assets/cypress/integration/explore/control.test.js
+++ b/superset/assets/cypress/integration/explore/control.test.js
@@ -208,6 +208,7 @@ describe('Advanced analytics', () => {
cy.get('span')
.contains('Advanced Analytics')
+ .parent()
.siblings()
.first()
.click();
diff --git a/superset/assets/src/explore/components/ControlPanelSection.jsx b/superset/assets/src/explore/components/ControlPanelSection.jsx
index 7992fa6..c5be657 100644
--- a/superset/assets/src/explore/components/ControlPanelSection.jsx
+++ b/superset/assets/src/explore/components/ControlPanelSection.jsx
@@ -31,21 +31,21 @@ export default class ControlPanelSection extends React.Component {
return (
label &&
<div>
+ <span>
+ <span onClick={this.toggleExpand.bind(this)}>{label}</span>
+ {' '}
+ {description && <InfoTooltipWithTrigger label={label} tooltip={description} />}
+ {hasErrors &&
+ <InfoTooltipWithTrigger
+ label="validation-errors"
+ bsStyle="danger"
+ tooltip="This section contains validation errors"
+ />}
+ </span>
<i
- className={`text-primary expander fa fa-caret-${this.state.expanded ? 'down' : 'right'}`}
+ className={`float-right fa-lg text-primary expander fa fa-angle-${this.state.expanded ? 'up' : 'down'}`}
onClick={this.toggleExpand.bind(this)}
/>
- {' '}
- <span onClick={this.toggleExpand.bind(this)}>{label}</span>
- {' '}
- {description && <InfoTooltipWithTrigger label={label} tooltip={description} />}
- {hasErrors &&
- <InfoTooltipWithTrigger
- label="validation-errors"
- bsStyle="danger"
- tooltip="This section contains validation errors"
- />
- }
</div>);
}