Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

filter & chart header UI enhancements #283

Merged
merged 2 commits into from Oct 12, 2020
Merged

filter & chart header UI enhancements #283

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c91469c
filter & chart header UI enhancements
deveshchatuphale7 Oct 11, 2020
6d24957
Updated filter count to display only selected filters
deveshchatuphale7 Oct 12, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/components/home/boardings-section/boardings.section.js
View file
Open in desktop
Expand Up @@ -48,7 +48,7 @@ class BoardingsSection extends Component {
}
return (
<section className="flex-column justify-start align-start standard-view white-bg box-shadow margin-bottom charts-section">
<div className="flex-row justify-between align-center full-view">
<div className="flex-row justify-between align-center full-view border-bottom gray-bg">
<h2 className="chart-name">{t("NAVIGATION.BOARDINGS")}</h2>
<FilterPanel
options={{ useChartsSyntax: true }}
Expand Down
2 changes: 2 additions & 0 deletions src/components/home/compliance-rate-section/compliance-rate.section.js
View file
Open in desktop
Expand Up @@ -50,7 +50,9 @@ class ComplianceRateSection extends Component{
}
return (
<section className="flex-column justify-start align-start standard-view white-bg box-shadow margin-bottom charts-section">
<div className="flex-row justify-between align-center full-view border-bottom gray-bg">
<h2 className="chart-name">{t("HOME_PAGE.COMPLIANCE_RATE")}</h2>
</div>
<div className="flex-row justify-between align-stretch full-view lg-chart">
<div className="half-row-view">
<div className="align-stretch md-chart compliance-rate-value ">
Expand Down
2 changes: 1 addition & 1 deletion src/components/home/patrol-hours-section/patrol-hours.section.js
View file
Open in desktop
Expand Up @@ -49,7 +49,7 @@ class PatrolHoursSection extends Component {

return (
<section className="flex-column justify-start align-start standard-view white-bg box-shadow margin-bottom charts-section patrol-hours-section">
<div className="flex-row justify-between align-center full-view">
<div className="flex-row justify-between align-center full-view border-bottom gray-bg">
<h2 className="chart-name">{t("HOME_PAGE.OFFICER_PATROL_HOURS")}</h2>
<FilterPanel
options={{ useChartsSyntax: true }}
Expand Down
11 changes: 2 additions & 9 deletions src/components/partials/filter-panel/filter-panel.component.js
View file
Open in desktop
Expand Up @@ -169,15 +169,8 @@ class FilterPanel extends Component {
))}
</div>
<div className="relative">
<div className="filter-btn blue-btn" onClick={this.showFilter}>
{options && options.buttonTitle
? options.buttonTitle
: t("FILTER.FILTER")}
<img
className="custom-down-arrow"
src={require("../../../assets/angle-arrow-down.svg")}
alt="no arrow img"
/>
<div className="filter-btn blue-btn icon-radius d-flex flex-row align-end" onClick={this.showFilter}>
<span class="material-icons icon-font">filter_alt</span> { filterParts.length ? `(${filterParts.length})` : "" }
</div>
<div
className={
Expand Down
7 changes: 7 additions & 0 deletions src/components/partials/filter-panel/filter-panel.css
View file
Open in desktop
Expand Up @@ -12,6 +12,13 @@
transition-timing-function: ease-in-out;
}

.icon-radius{
border-radius: 8px;
}
.icon-font{
font-size: 15px;
}

.filter-panel.invisible {
height: 0;
overflow-y: hidden;
Expand Down