Skip to content
This repository has been archived by the owner on Mar 23, 2023. It is now read-only.

refactor/ui: hide secondary action buttons where applicable & misc ui tweaks #757

Merged
merged 11 commits into from Dec 16, 2018
Merged

refactor/ui: hide secondary action buttons where applicable & misc ui tweaks #757

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
537a61d
ui: remove superfluos padding from peer reload button
dated Dec 14, 2018
0155445
ui: square ark logo
dated Dec 14, 2018
760f2a1
ui: precise settings arrows placement
dated Dec 14, 2018
21b14dc
ui: drop down arrow placement
dated Dec 14, 2018
01e4655
ui: vertically align clipboard icon in button
dated Dec 14, 2018
c9434cb
ui: increase spacing in sign/verify tab
dated Dec 14, 2018
6acc75c
ui: hide border on last row in transaction table
dated Dec 14, 2018
88d8b2a
ui: hide delegate registration and 2nd passphrase buttons
dated Dec 15, 2018
b2eda62
ui: remove superfluos margin from passphrase reload button
dated Dec 15, 2018
a58eaa7
ui: center save transaction button
dated Dec 15, 2018
3a3dc49
Merge branch 'develop' into ui-tweaks
faustbrian Dec 16, 2018
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
Binary file modified src/renderer/assets/images/ark-logo.png
View file
Open in desktop
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions src/renderer/components/App/AppSidemenu/AppSidemenu.vue
View file
Open in desktop
Expand Up @@ -8,7 +8,7 @@
class="AppSidemenu relative bg-transparent"
>
<div
class="AppSidemenu__container flexify w-full h-full justify-between"
class="AppSidemenu__container flexify w-full lg:h-full justify-between"
>
<!-- ARK logo -->
<RouterLink
Expand Down Expand Up @@ -232,7 +232,7 @@ export default {

.AppSidemenu--vertical .AppSidemenu__container__scrollable { @apply rounded-lg py-2 }
.AppSidemenu--vertical .AppSidemenu__item { @apply h-16 }
.AppSidemenu--vertical .AppSidemenu__logo { @apply rounded-lg mb-3 px-4 py-5 }
.AppSidemenu--vertical .AppSidemenu__logo { @apply rounded-lg mb-3 p-5 }
.AppSidemenu--vertical .AppSidemenu__logo img { @apply w-18 }
.AppSidemenu--vertical .flexify { @apply flex flex-col }
.AppSidemenu--vertical { @apply w-22 mx-6 rounded-lg }
Expand Down
4 changes: 2 additions & 2 deletions src/renderer/components/App/AppSidemenu/AppSidemenuNetworkStatus.vue
View file
Open in desktop
Expand Up @@ -30,7 +30,7 @@
</button>
<ButtonReload
:is-refreshing="isRefreshing"
class="AppSidemenuNetworkStatus__refresh-button bg-theme-settings-button absolute pin-t pin-r pin-b pt-3 pb-2 px-2"
class="AppSidemenuNetworkStatus__refresh-button bg-theme-settings-button absolute pin-t pin-r pin-b px-2"
@click="refreshPeer"
/>
</div>
Expand Down Expand Up @@ -236,7 +236,7 @@ export default {
.AppSidemenuNetworkStatus--horizontal {
width: 380px;
right: 4.5rem;
top: 5.5rem;
top: 5.75rem;
}

.AppSidemenuNetworkStatus__status__height,
Expand Down
2 changes: 1 addition & 1 deletion src/renderer/components/App/AppSidemenu/AppSidemenuSettings.vue
View file
Open in desktop
Expand Up @@ -284,6 +284,6 @@ export default {
.AppSidemenuOptionsSettings--horizontal {
width: 300px;
right: 8.5rem;
top: 5.5rem;
top: 5.75rem;
}
</style>
2 changes: 1 addition & 1 deletion src/renderer/components/Button/ButtonClipboard.vue
View file
Open in desktop
Expand Up @@ -7,7 +7,7 @@
>
<div
:class="{ 'animated wobble': isCopying }"
class="fill-current block"
class="fill-current flex items-center"
>
<SvgIcon
:view-box="viewBox"
Expand Down
2 changes: 1 addition & 1 deletion src/renderer/components/Menu/MenuDropdown/MenuDropdownHandler.vue
View file
Open in desktop
Expand Up @@ -14,7 +14,7 @@
</slot>
</span>

<span class="pl-2 pr-1">
<span class="flex pl-2 pr-1">
<SvgIcon
:class="{ 'opacity-25': iconDisabled }"
name="arrow-dropdown"
Expand Down
4 changes: 2 additions & 2 deletions src/renderer/components/Menu/MenuOptions/MenuOptions.vue
View file
Open in desktop
Expand Up @@ -45,11 +45,11 @@ export default {
}

.MenuOptions__default--vertical:after {
top: 20px;
top: 86px;
}

.MenuOptions__settings--vertical:after {
top: 110px;
top: 104px;
}

.MenuOptions--vertical:after {
Expand Down
2 changes: 1 addition & 1 deletion src/renderer/components/Transaction/TransactionConfirm/TransactionConfirm.vue
View file
Open in desktop
Expand Up @@ -11,7 +11,7 @@
:is="activeComponent"
/>

<footer class="mt-10 flex justify-between items-baseline">
<footer class="mt-10 flex justify-between items-center">
<div>
<button
class="TransactionConfirm__back-button blue-button mr-2 px-5"
Expand Down
2 changes: 1 addition & 1 deletion src/renderer/components/Transaction/TransactionForm/TransactionFormSecondSignature.vue
View file
Open in desktop
Expand Up @@ -106,7 +106,7 @@
:is-refreshing="isGenerating"
:title="$t('WALLET_SECOND_SIGNATURE.NEW')"
class="bg-theme-modal-footer-button mr-2"
text-class="text-theme-modal-footer-button-text mt-1"
text-class="text-theme-modal-footer-button-text"
@click="generateNewPassphrase"
/>

Expand Down
4 changes: 2 additions & 2 deletions src/renderer/components/Wallet/WalletHeading/WalletHeadingSecondaryActions.vue
View file
Open in desktop
Expand Up @@ -19,7 +19,7 @@
</ButtonModal>

<ButtonModal
v-show="!currentWallet.isContact"
v-show="!currentWallet.isContact && !currentWallet.isDelegate"
:class="buttonStyle"
:label="$t('WALLET_HEADING.ACTIONS.REGISTER_DELEGATE')"
icon="register-delegate"
Expand All @@ -35,7 +35,7 @@
</ButtonModal>

<ButtonModal
v-show="!currentWallet.isContact && !currentWallet.isLedger"
v-show="!currentWallet.isContact && !currentWallet.isLedger && !currentWallet.secondPublicKey"
:class="buttonStyle"
:label="$t('WALLET_HEADING.ACTIONS.SECOND_PASSPHRASE')"
icon="2nd-passphrase"
Expand Down
2 changes: 1 addition & 1 deletion src/renderer/components/Wallet/WalletSignVerify/WalletSignVerify.vue
View file
Open in desktop
Expand Up @@ -6,7 +6,7 @@
:size="75"
/>

<div class="flex flex-col justify-center ml-2">
<div class="flex flex-col justify-center pl-4">
<span class="font-bold">
{{ $t('SIGN_VERIFY.VERIFY_WALLET') }}
</span>
Expand Down
6 changes: 5 additions & 1 deletion src/renderer/styles/_table.css
View file
Open in desktop
Expand Up @@ -79,7 +79,11 @@
}

.vgt-table tr.clickable:hover {
@apply .bg-theme-table-row-hover;
@apply .bg-theme-table-row-hover
}

.vgt-table tr:last-child > td {
@apply .border-0
}

.vgt-table tr > td:not(:last-child),
Expand Down