Skip to content

Commit

Permalink
[#2741] prepare Filterbar for mobile/desktop form resets
Browse files Browse the repository at this point in the history
  • Loading branch information
“jiromaykin” committed Oct 1, 2024
1 parent 5730719 commit 268a2f6
Show file tree
Hide file tree
Showing 5 changed files with 31 additions and 7 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
</button>
</div>
</div>
<div class="form__actions form__actions--fullwidth form__actions--reset">
<div class="form__reset--desktop form__actions--fullwidth form__actions--reset">
{% button bordered=False text=_("Wis alle filters") id="resetMultiSelectFilters" type="button" transparent=True primary=True %}
</div>
</div>
Expand Down
12 changes: 8 additions & 4 deletions src/open_inwoner/scss/components/FilterBar/FilterBar.scss
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
height: 70vh;
position: fixed;
top: 30vh;
transition: top 2s linear;
z-index: 500;

.multiselect-listbox__modal {
Expand Down Expand Up @@ -48,10 +49,13 @@
.filter-bar__form {
margin: 0;
padding: 0 0 0 var(--spacing-small);
display: flex;
flex-direction: row;
align-items: flex-start;
gap: var(--spacing-extra-large);

@media (min-width: 768px) {
display: flex;
flex-direction: row;
align-items: flex-start;
gap: var(--spacing-extra-large);
}
}

&__frequency-sum {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,7 @@
text-decoration: underline;
}
}

.checkbox__input:focus-visible ~ .checkbox__label {
border-radius: var(--border-radius);
outline: var(--focus-border-style) var(--focus-border-width)
Expand Down Expand Up @@ -182,6 +183,7 @@
&--reset {
position: relative;
z-index: 1000;

.button--transparent {
justify-content: flex-start;
padding-left: 0;
Expand Down
18 changes: 18 additions & 0 deletions src/open_inwoner/scss/components/Form/Form.scss
Original file line number Diff line number Diff line change
Expand Up @@ -218,6 +218,24 @@
grid-area: primary;
}

.form__reset {
&--desktop {
display: none;

@media (min-width: 768px) {
display: block;
}
}

&--mobile {
display: block;

@media (min-width: 768px) {
display: none;
}
}
}

&--inline {
grid-template-columns: 1fr auto;
align-items: start;
Expand Down
4 changes: 2 additions & 2 deletions src/open_inwoner/templates/pages/cases/list_inner.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ <h1 class="utrecht-heading-1" id="cases">{{ page_title }} ({{ paginator.count }}
<div class="filter-bar" id="filterBar">
<div class="filter-bar__mobile-controls">
{% button icon="close" text=_("Sluiten") hide_text=True icon_outlined=True transparent=True extra_classes="show-controls" %}
<div class="form__actions form__actions--fullwidth form__actions--reset">
<div class="form__reset--desktop form__actions--fullwidth form__actions--reset">
{% button bordered=False text=_("Wis alle filters") id="resetFilters" type="button" transparent=True primary=True %}
</div>
</div>
Expand All @@ -19,7 +19,7 @@ <h1 class="utrecht-heading-1" id="cases">{{ page_title }} ({{ paginator.count }}
{% include "components/FilterBar/MultiSelectListbox.html" with statusfrequencies=status_freqs %}

{# Mobile submit button updates on select #}
<div class="form__actions form__actions--fullwidth" id="filterFormActions">
<div class="form__reset--mobile form__actions form__actions--fullwidth" id="filterFormActions">
<button class="button button--primary" type="submit" title="{% trans 'Toon resultaten' %}" aria-label="{% trans 'Toon resultaten' %}" id="filterCases">
{% trans 'Toon' %}<span class="filter-bar__frequency-sum" id="frequencySum">0</span><span id="resultText">{% trans 'resultaten' %}</span>
</button>
Expand Down

0 comments on commit 268a2f6

Please sign in to comment.