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

fix: adjust margins/padding on sender with direction #839

Closed
wants to merge 7 commits into from
Closed

fix: adjust margins/padding on sender with direction #839

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
f269b46
Fix table margin on a fresh dev branch
alfonsobries Jun 11, 2021
d5524ef
style: resolve style guide violations
alfonsobries Jun 11, 2021
81f6089
Recompile assets
alfonsobries Jun 11, 2021
7146f87
Merge branch 'fix/sender-with-direction-aligment' of github.com:ArkEc…
alfonsobries Jun 11, 2021
2cf0244
style: resolve style guide violations
alfonsobries Jun 11, 2021
852eff3
style: resolve style guide violations
faustbrian Jun 11, 2021
78ef95f
style: resolve style guide violations
faustbrian Jun 11, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion public/css/app.css
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion public/mix-manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"/js/manifest.js": "/js/manifest.js?id=7db827d654313dce4250",
"/js/app.js": "/js/app.js?id=b916b9f247e6053bc523",
"/css/app.css": "/css/app.css?id=f44f1368e51539d7431a",
"/css/app.css": "/css/app.css?id=89d2dab5c0fe1e596159",
"/js/vendor.js": "/js/vendor.js?id=d2021daf9ac3eabd5cad",
"/js/chart.js": "/js/chart.js?id=34ccf97ba22038c7b06d",
"/js/clipboard.js": "/js/clipboard.js?id=99d052d4c54fa6c91edc"
Expand Down
6 changes: 1 addition & 5 deletions resources/css/_tables.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

/* Table Avatar */
td.hoverable-cell .table-avatar {
@apply -my-1 border-4 border-white rounded-full;
@apply -my-1 -mr-1 border-4 border-white rounded-full;
}

tr:hover td.hoverable-cell .table-avatar {
Expand Down Expand Up @@ -53,10 +53,6 @@ tr:hover td.hoverable-cell .table-avatar {
@apply space-x-2;
}

.table-compact .sender-direction-wrapper {
@apply p-0 pr-2;
}

.table-compact .fiat-tooltip-sent,
.table-compact .fiat-tooltip-received {
@apply p-0 border-0;
Expand Down
2 changes: 1 addition & 1 deletion resources/views/components/charts/prices-fees.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{{-- @TODO: kept for possible use on statistics page - removed detail boxes as they are not part of the design --}}
<div
class="hidden border-b-20 border-theme-secondary-100 dark:border-black sm:block"
class="hidden sm:block border-b-20 border-theme-secondary-100 dark:border-black"
x-data="{
usesPriceChart: {{ Settings::usesPriceChart() ? 'true' : 'false' }},
usesFeeChart: {{ Settings::usesFeeChart() ? 'true' : 'false' }},
Expand Down
2 changes: 1 addition & 1 deletion resources/views/components/delegates/skeletons/data-boxes.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<div class="flex space-x-4 w-full h-18 md:flex-col xl:flex-row md:space-x-0 xl:space-x-4 md:space-y-4 xl:space-y-0">
<div class="flex space-x-4 w-full md:flex-col md:space-y-4 md:space-x-0 xl:flex-row xl:space-y-0 xl:space-x-4 h-18">
<div class="flex flex-row py-3 px-6 bg-white rounded-xl dark:bg-theme-secondary-900">
<div class="flex w-full mr-2 lg:w-1/2 xl:w-full">
<div class="flex items-center pr-6 space-x-4 border-r border-theme-secondary-300 dark:border-theme-secondary-800">
Expand Down
4 changes: 2 additions & 2 deletions resources/views/components/general/identity.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
{{ $prefix }}
@endif

<a href="{{ route('wallet', $model->address()) }}" class="font-semibold link sm:hidden md:flex">
<a href="{{ route('wallet', $model->address()) }}" class="font-semibold sm:hidden md:flex link">
@if ($model->username())
@if ($prefix ?? false)
<div class="delegate-name-truncate-prefix">
Expand Down Expand Up @@ -41,7 +41,7 @@
@endif
</a>

<a href="{{ route('wallet', $model->address()) }}" class="hidden font-semibold link sm:flex md:hidden">
<a href="{{ route('wallet', $model->address()) }}" class="hidden font-semibold sm:flex md:hidden link">
@if ($model->username())
{{ $model->username() }}
@else
Expand Down
10 changes: 5 additions & 5 deletions resources/views/components/general/search/search-input.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
x-ref="input"
type="text"
placeholder="@lang('forms.search.term_placeholder')"
class="hidden w-full text-theme-secondary-700 dark:text-theme-secondary-700 dark:bg-theme-secondary-900 dark:placeholder-text-theme-secondary-700 overflow-ellipsis sm:block"
class="hidden w-full sm:block text-theme-secondary-700 dark:text-theme-secondary-700 dark:bg-theme-secondary-900 dark:placeholder-text-theme-secondary-700 overflow-ellipsis"
wire:model.defer="state.term"
wire:keydown.enter="performSearch"
@keydown.enter="searching = true"
Expand All @@ -13,7 +13,7 @@ class="hidden w-full text-theme-secondary-700 dark:text-theme-secondary-700 dark
x-ref="inputMobile"
type="text"
placeholder="@lang('forms.search.term_placeholder_mobile')"
class="w-full dark:text-theme-secondary-700 dark:bg-theme-secondary-900 dark:placeholder-text-theme-secondary-700 overflow-ellipsis sm:hidden"
class="w-full sm:hidden dark:text-theme-secondary-700 dark:bg-theme-secondary-900 dark:placeholder-text-theme-secondary-700 overflow-ellipsis"
wire:model.defer="state.term"
wire:keydown.enter="performSearch"
@keydown.enter="searching = true"
Expand All @@ -22,7 +22,7 @@ class="w-full dark:text-theme-secondary-700 dark:bg-theme-secondary-900 dark:pla

<button
type="button"
class="hidden py-2 px-4 mr-8 font-normal text-center rounded text-theme-primary-500 transition-default hover:bg-theme-primary-100 dark:hover:bg-theme-secondary-800 dark:text-theme-secondary-600 md:block"
class="hidden py-2 px-4 mr-8 font-normal text-center rounded md:block text-theme-primary-500 transition-default hover:bg-theme-primary-100 dark:hover:bg-theme-secondary-800 dark:text-theme-secondary-600"
@click="showAdvanced = !showAdvanced;"
>
<span x-show="!showAdvanced">@lang('actions.advanced_search')</span>
Expand All @@ -31,7 +31,7 @@ class="hidden py-2 px-4 mr-8 font-normal text-center rounded text-theme-primary-

<button
type="button"
class="hidden relative button-primary md:block"
class="hidden relative md:block button-primary"
:class="{ 'pointer-events-none' : searching }"
wire:click="performSearch"
@click="searching = true"
Expand All @@ -44,7 +44,7 @@ class="hidden relative button-primary md:block"

<button
type="button"
class="cursor-pointer text-theme-secondary-700 hover:text-theme-primary-600 dark:text-theme-secondary-500 dark:hover:text-theme-secondary-400 md:hidden"
class="cursor-pointer md:hidden text-theme-secondary-700 hover:text-theme-primary-600 dark:text-theme-secondary-500 dark:hover:text-theme-secondary-400"
wire:click="performSearch"
@click="searching = true"
>
Expand Down
4 changes: 2 additions & 2 deletions resources/views/components/general/search/search-modal.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ class="container flex overflow-auto fixed inset-0 z-50 flex-col py-24 mx-auto w-
>
<div wire:click.self="closeModal" class="fixed inset-0 opacity-70 dark:opacity-80 bg-theme-secondary-900 dark:bg-theme-secondary-800"></div>

<div class="flex overflow-auto relative flex-col w-full md:overflow-visible content-container-full-width md:px-8">
<div class="flex overflow-auto relative flex-col w-full md:overflow-visible md:px-8 content-container-full-width">
<h2 class="px-8 mx-auto mb-10 text-3xl font-bold text-center text-white md:text-4xl">
@lang('pages.search.title')
</h2>
Expand All @@ -55,7 +55,7 @@ class="overflow-auto md:overflow-visible"
/>

<div
class="py-4 font-semibold text-center rounded-b-lg bg-theme-primary-100 text-theme-primary-600 dark:bg-theme-secondary-800 dark:text-theme-secondary-200 md:hidden"
class="py-4 font-semibold text-center rounded-b-lg md:hidden bg-theme-primary-100 text-theme-primary-600 dark:bg-theme-secondary-800 dark:text-theme-secondary-200"
@click="showAdvanced = !showAdvanced"
>
<span x-show="!showAdvanced">@lang('actions.advanced_search')</span>
Expand Down
2 changes: 1 addition & 1 deletion resources/views/components/general/search/search.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ class="md:hidden"
/>

<div
class="py-4 font-semibold text-center rounded-b-xl bg-theme-primary-100 text-theme-primary-600 dark:bg-theme-secondary-800 dark:text-theme-secondary-200 md:hidden"
class="py-4 font-semibold text-center rounded-b-xl md:hidden bg-theme-primary-100 text-theme-primary-600 dark:bg-theme-secondary-800 dark:text-theme-secondary-200"
@click="showAdvancedMobile = !showAdvancedMobile"
x-cloak
>
Expand Down
2 changes: 1 addition & 1 deletion resources/views/components/navbar/logo.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<span class="flex relative items-center">
<img src="/images/logo.svg" class="h-10 lg:h-11" />

<span class="hidden ml-4 sm:flex text-theme-secondary-900 dark:text-theme-secondary-200 sm:items-center sm:text-2xl">
<span class="hidden ml-4 sm:flex sm:items-center sm:text-2xl text-theme-secondary-900 dark:text-theme-secondary-200">
<span class="font-bold">
{{ Network::explorerTitle() }}
</span>
Expand Down
6 changes: 3 additions & 3 deletions resources/views/components/navbar/navbar.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ class="hidden sm:flex"
</div>

<div class="flex justify-end">
<div class="flex flex-1 justify-end items-center sm:items-stretch sm:justify-between">
<div class="flex flex-1 justify-end items-center sm:justify-between sm:items-stretch">
{{-- Desktop Navbar Items --}}
<div class="hidden items-center -mx-4 lg:flex">
@foreach ($navigation as $navItem)
Expand All @@ -62,7 +62,7 @@ class="inline-flex font-semibold leading-5 group
<div class="hidden items-center md:flex">
<x-navbar.separator class="md:hidden lg:inline" />

<div class="hidden font-semibold lg:pl-8 md:flex text-theme-secondary-900 dark:text-white">
<div class="hidden font-semibold md:flex lg:pl-8 text-theme-secondary-900 dark:text-white">
<livewire:price-ticker />
</div>
</div>
Expand Down Expand Up @@ -117,7 +117,7 @@ class="md:hidden"
@endforeach

@if(Network::canBeExchanged())
<div class="flex py-3 px-8 mt-2 -mb-4 font-semibold bg-theme-secondary-100 text-theme-secondary-900 dark:text-white dark:bg-theme-secondary-800 md:hidden">
<div class="flex py-3 px-8 mt-2 -mb-4 font-semibold md:hidden bg-theme-secondary-100 text-theme-secondary-900 dark:text-white dark:bg-theme-secondary-800">
<livewire:price-ticker />
</div>
@endif
Expand Down
4 changes: 2 additions & 2 deletions resources/views/components/page-headers/avatar-with-icon.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
</div>
</div>

<div class="hidden rounded-full border-4 border-theme-secondary-900 lg:flex">
<div class="hidden rounded-full border-4 lg:flex border-theme-secondary-900">
<div class="bg-theme-secondary-900 circled-icon text-theme-secondary-400 border-theme-secondary-700">
<x-general.avatar-small :identifier="$model->address()" />
</div>
</div>

<div
class="flex bg-theme-secondary-900 lg:hidden circled-icon text-theme-secondary-400 border-theme-secondary-700 dark:bg-theme-secondary-900">
class="flex lg:hidden bg-theme-secondary-900 circled-icon text-theme-secondary-400 border-theme-secondary-700 dark:bg-theme-secondary-900">
<x-general.avatar-small :identifier="$model->address()" />
</div>
6 changes: 3 additions & 3 deletions resources/views/components/page-headers/block.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,15 @@

@if ($block->previousBlockUrl() || $block->nextBlockUrl())
<x-slot name="extension">
<div class="flex items-center mt-6 space-x-2 text-theme-secondary-400 lg:mt-0 lg:ml-3">
<div class="flex items-center mt-6 space-x-2 lg:mt-0 lg:ml-3 text-theme-secondary-400">
@if ($block->previousBlockUrl())
<a href="{{ $block->previousBlockUrl() }}" class="flex flex-1 justify-center items-center px-4 h-11 rounded cursor-pointer bg-theme-secondary-800 hover:bg-theme-secondary-700 transition-default lg:flex-none">
<a href="{{ $block->previousBlockUrl() }}" class="flex flex-1 justify-center items-center px-4 h-11 rounded cursor-pointer lg:flex-none bg-theme-secondary-800 hover:bg-theme-secondary-700 transition-default">
<x-ark-icon name="chevron-left" size="sm" />
</a>
@endif

@if ($block->nextBlockUrl())
<a href="{{ $block->nextBlockUrl() }}" class="flex flex-1 justify-center items-center px-4 h-11 rounded cursor-pointer bg-theme-secondary-800 hover:bg-theme-secondary-700 transition-default lg:flex-none">
<a href="{{ $block->nextBlockUrl() }}" class="flex flex-1 justify-center items-center px-4 h-11 rounded cursor-pointer lg:flex-none bg-theme-secondary-800 hover:bg-theme-secondary-700 transition-default">
<x-ark-icon name="chevron-right" size="sm" />
</a>
@endif
Expand Down
6 changes: 3 additions & 3 deletions resources/views/components/page-headers/wallet.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

<x-slot name="extension">
<div class="flex flex-col space-y-4 w-full lg:flex-row lg:justify-between lg:space-y-0">
<div class="grid grid-cols-1 space-y-4 sm:grid-cols-3 lg:flex sm:space-y-0 lg:space-x-5">
<div class="grid grid-cols-1 space-y-4 sm:grid-cols-3 sm:space-y-0 lg:flex lg:space-x-5">
<x-general.header-entry
title="{{ trans('pages.wallet.delegate.rank') }} / {{ trans('pages.wallet.delegate.status') }}"
>
Expand Down Expand Up @@ -84,15 +84,15 @@
</x-general.header-entry>
</div>

<div class="grid grid-cols-1 space-y-4 sm:grid-cols-3 lg:flex sm:space-y-0 lg:space-x-5">
<div class="grid grid-cols-1 space-y-4 sm:grid-cols-3 sm:space-y-0 lg:flex lg:space-x-5">
<x-general.header-entry
:title="trans('pages.wallet.delegate.forged_blocks')"
:text="trans('general.see_all')"
:url="route('wallet.blocks', $wallet->address())"
text-alignment="lg:text-right"
>
<x-slot name="icon">
<div class="md:w-11 md:mr-4 lg:w-0 lg:mr-0"></div>
<div class="md:mr-4 md:w-11 lg:mr-0 lg:w-0"></div>
</x-slot>
</x-general.header-entry>

Expand Down
6 changes: 3 additions & 3 deletions resources/views/components/page-headers/wallet/actions/public-key.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<div x-data="{ publicKeyModalVisible: false }" class="flex-1 mt-4 w-full sm:w-auto sm:mt-0">
<div x-data="{ publicKeyModalVisible: false }" class="flex-1 mt-4 w-full sm:mt-0 sm:w-auto">
<button type="button" @click="publicKeyModalVisible = !publicKeyModalVisible"
class="flex justify-center items-center px-3 w-full h-11 rounded cursor-pointer lg:w-16 bg-theme-secondary-800 hover:bg-theme-primary-600 transition-default lg:flex-none dark:text-theme-secondary-600 dark:hover:text-theme-secondary-200">
class="flex justify-center items-center px-3 w-full h-11 rounded cursor-pointer lg:flex-none lg:w-16 bg-theme-secondary-800 hover:bg-theme-primary-600 transition-default dark:text-theme-secondary-600 dark:hover:text-theme-secondary-200">
<x-ark-icon name="key" />
</button>

<div @click.away="publicKeyModalVisible = false" x-show="publicKeyModalVisible" class="absolute right-0 left-0 mx-8 mt-4 w-auto bg-white rounded-xl shadow-lg z-15 lg:mt-1 lg:mx-0 lg:left-auto lg:mr-32 dark:shadow-lg-dark dark:bg-theme-secondary-900" x-cloak>
<div @click.away="publicKeyModalVisible = false" x-show="publicKeyModalVisible" class="absolute right-0 left-0 mx-8 mt-4 w-auto bg-white rounded-xl shadow-lg lg:left-auto lg:mx-0 lg:mt-1 lg:mr-32 z-15 dark:shadow-lg-dark dark:bg-theme-secondary-900" x-cloak>
<div class="flex flex-col p-6 space-y-2 leading-tight">
<span class="text-sm font-semibold text-theme-secondary-400 dark:text-theme-secondary-700">@lang('pages.wallet.public_key.title')</span>
<span class="flex font-semibold link">
Expand Down
2 changes: 1 addition & 1 deletion resources/views/components/page-headers/wallet/frame-item.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<div class="flex flex-1 font-semibold border-theme-secondary-800 lg:border-l lg:ml-8 lg:pl-8">
<div class="flex flex-1 font-semibold lg:pl-8 lg:ml-8 lg:border-l border-theme-secondary-800">
<div class="hidden items-center md:flex">
<div class="circled-icon text-theme-secondary-700 border-theme-secondary-800 dark:text-theme-secondary-600 dark:border-theme-secondary-600">
<x-ark-icon :name="$icon" />
Expand Down
2 changes: 1 addition & 1 deletion resources/views/components/page-headers/wallet/frame.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
<x-slot name="extension">
{{ $slot }}

<div class="flex flex-col-reverse items-center p-1 mt-6 space-y-2 sm:space-x-2 sm:space-y-0 sm:flex-row text-theme-secondary-200 lg:mt-0 lg:ml-4">
<div class="flex flex-col-reverse items-center p-1 mt-6 space-y-2 sm:flex-row sm:space-y-0 sm:space-x-2 lg:mt-0 lg:ml-4 text-theme-secondary-200">
@unless($wallet->isCold())
<x-page-headers.wallet.actions.public-key :public-key="$wallet->publicKey()" />
@endunless
Expand Down
2 changes: 1 addition & 1 deletion resources/views/components/tables/rows/desktop/round-status-history.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<div class="flex flex-row justify-end items-center space-x-1 w-full round-status-history md:justify-start">
<div class="flex flex-row justify-end items-center space-x-1 w-full md:justify-start round-status-history">
@foreach($model->performance() as $performed)
@if($performed)
<span class="text-theme-success-500 round-status">
Expand Down
4 changes: 2 additions & 2 deletions resources/views/components/tables/rows/desktop/skeletons/address.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@
:first-on="$firstOn"
:last-on="$lastOn"
>
<div class="flex justify-between items-center space-x-2 w-full md:space-x-4 md:flex-row md:justify-start">
<div class="flex justify-between items-center space-x-2 w-full md:flex-row md:justify-start md:space-x-4">
<div>
<div class="w-6 h-6 rounded-full avatar-wrapper md:w-11 md:h-11 loading-state"></div>
<div class="w-6 h-6 rounded-full md:w-11 md:h-11 avatar-wrapper loading-state"></div>
</div>

<x-loading.text />
Expand Down
2 changes: 1 addition & 1 deletion resources/views/components/tables/rows/desktop/skeletons/status.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
:first-on="$firstOn"
:last-on="$lastOn"
>
<div class="flex flex-row justify-end items-center space-x-2 w-full md:space-x-3 md:justify-start">
<div class="flex flex-row justify-end items-center space-x-2 w-full md:justify-start md:space-x-3">
<div class="w-6 h-6 rounded-full md:w-11 md:h-11 loading-state status-circle"></div>
<div class="hidden w-6 h-6 rounded-full sm:block md:w-11 md:h-11 loading-state status-circle"></div>
<div class="hidden w-6 h-6 rounded-full sm:block md:w-11 md:h-11 loading-state status-circle"></div>
Expand Down
Loading