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

feat-mobile: polish filter styles #5869

Merged
merged 3 commits into from Feb 15, 2023
Merged

feat-mobile: polish filter styles #5869

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d0c1ffe
style: polish filter drawer & filter/search tab spacing
begonaalvarezd Feb 15, 2023
0abd8f0
style: remove svelte transition due to jumping
begonaalvarezd Feb 15, 2023
a214b19
Merge branch 'develop' into feat-mobile/polish-filters
paul-boegelsack Feb 15, 2023
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
6 changes: 3 additions & 3 deletions packages/mobile/components/ActivityList.svelte
View file
Open in desktop
Expand Up @@ -82,17 +82,17 @@
</script>

<activity-list-container class="asset-list h-full flex flex-auto flex-col flex-grow flex-shrink-0">
<activity-list-header class="flex justify-between items-center">
<activity-list-header class="flex flex-row space-x-4 justify-between items-center mb-4">
<search-input-container class="block flex-1">
<SearchInput bind:value={searchValue} />
</search-input-container>
<Filter filterStoreValue={$activityFilter} filterType={FilterType.Activity} />
</activity-list-header>
{#if activityTileDataList.length > 0}
<VirtualList items={activityTileDataList} let:item>
<activity-tile-container class="block mb-2">
<activity-tile-container class="flex flex-col space-y-2 mb-2">
{#if item.title}
<Text fontWeight={FontWeight.semibold} color="gray-600" classes="my-2">
<Text fontWeight={FontWeight.semibold} color="gray-600">
{item.title} • {item.amount}
</Text>
{/if}
Expand Down
2 changes: 1 addition & 1 deletion packages/mobile/components/AssetList.svelte
View file
Open in desktop
Expand Up @@ -60,7 +60,7 @@

{#if assets}
<asset-list-container class="asset-list h-full flex flex-auto flex-col flex-grow flex-shrink-0">
<asset-list-header class="flex justify-between items-center sticky pb-4">
<asset-list-header class="flex flex-row space-x-4 justify-between items-center sticky mb-4">
<search-input-container class="block flex-1">
<SearchInput bind:value={searchValue} />
</search-input-container>
Expand Down
2 changes: 0 additions & 2 deletions packages/mobile/components/filters/FilterItem.svelte
View file
Open in desktop
@@ -1,5 +1,4 @@
<script lang="ts">
import { slide } from 'svelte/transition'
import { FontWeight, Text, Toggle } from '@ui'
import { localize } from '@core/i18n'
import {
Expand Down Expand Up @@ -28,7 +27,6 @@
{#if filterUnit.active}
<filter-item-type
class="block expanded bg-gray-50 px-4 py-3 -mx-5 dark:bg-transparent border-t border-solid border-gray-200 dark:border-gray-800"
transition:slide
>
{#if filterUnit.type === 'number'}
<NumberFilterItem bind:filterUnit />
Expand Down
14 changes: 7 additions & 7 deletions packages/mobile/views/dashboard/drawers/filter/FilterDrawer.svelte
View file
Open in desktop
Expand Up @@ -27,13 +27,13 @@
<Text fontWeight={FontWeight.bold} fontSize="16" classes="text-center flex grow-1">
{localize('filters.title')}
</Text>
<button type="button" disabled={!isChanged} on:click={filterRouterComponent?.apply}>
<Text
fontSize="15"
fontWeight={FontWeight.semibold}
overrideColor
classes={isChanged ? 'text-blue-500' : 'text-gray-200'}
>
<button
type="button"
disabled={!isChanged}
class:opacity-40={!isChanged}
on:click={filterRouterComponent?.apply}
>
<Text fontSize="15" fontWeight={FontWeight.semibold} highlighted>
{localize('actions.apply')}
</Text>
</button>
Expand Down