fix: More tweaks needed after adding Doctype tag (#10504)

* fixing last-of-type specificity

* Simplifying/consolidating styles

* fixing filterbox in explore

* linting

* adding some px to font sizes

* fixing in-dash overflow

* removing px for one special fontsize case

* simplifying, addressing comments
This commit is contained in:
Evan Rusackas
2020-08-13 11:50:14 -07:00
committed by GitHub
parent c0ebd7f434
commit a3fd2b420e
7 changed files with 38 additions and 54 deletions

View File

@@ -24,6 +24,7 @@ import { AsyncCreatableSelect, CreatableSelect } from 'src/components/Select';
import { Button } from 'react-bootstrap';
import { t } from '@superset-ui/translation';
import { SupersetClient } from '@superset-ui/connection';
import styled from '@superset-ui/style';
import FormLabel from 'src/components/FormLabel';
@@ -99,6 +100,13 @@ const defaultProps = {
instantFiltering: false,
};
const Styles = styled.div`
height: 100%;
min-height: 100%;
max-height: 100%;
overflow: visible;
`;
class FilterBox extends React.Component {
constructor(props) {
super(props);
@@ -424,23 +432,21 @@ class FilterBox extends React.Component {
const { instantFiltering } = this.props;
return (
<div className="scrollbar-container">
<div className="scrollbar-content">
{this.renderDateFilter()}
{this.renderDatasourceFilters()}
{this.renderFilters()}
{!instantFiltering && (
<Button
bsSize="small"
bsStyle="primary"
onClick={this.clickApply.bind(this)}
disabled={!this.state.hasChanged}
>
{t('Apply')}
</Button>
)}
</div>
</div>
<Styles>
{this.renderDateFilter()}
{this.renderDatasourceFilters()}
{this.renderFilters()}
{!instantFiltering && (
<Button
bsSize="small"
bsStyle="primary"
onClick={this.clickApply.bind(this)}
disabled={!this.state.hasChanged}
>
{t('Apply')}
</Button>
)}
</Styles>
);
}
}