From 2e9d522ae7fc89721f3a6fe130796318aae26805 Mon Sep 17 00:00:00 2001 From: jerome Date: Sat, 6 Jul 2019 13:08:17 -0700 Subject: [PATCH 01/22] UI polish CSS and HTML UI polish: tidied up font sizes, margins and paddings. Used more gradients to make the app less "flat" --- public/partialClient.html | 6 +- .../views/acceptCorrespondentInvitation.html | 2 +- public/views/backup.html | 2 +- public/views/copayers.html | 2 +- public/views/correspondentDevice.html | 4 +- public/views/correspondentDevices.html | 10 ++-- public/views/editCorrespondentDevice.html | 2 +- public/views/export.html | 2 +- public/views/import.html | 2 +- public/views/includes/copayers.html | 2 +- public/views/includes/password.html | 4 +- public/views/includes/topbar.html | 5 +- public/views/includes/transaction.html | 2 +- public/views/modals/destination-address.html | 2 +- public/views/modals/offer-contract.html | 2 +- public/views/modals/select-subwallet.html | 4 +- public/views/modals/vote.html | 2 +- public/views/paperWallet.html | 4 +- public/views/preferencesAlias.html | 2 +- public/views/preferencesDeviceName.html | 2 +- .../views/preferencesEditAttestorAddress.html | 2 +- .../preferencesEditRealNameAttestors.html | 2 +- public/views/preferencesEditWitness.html | 2 +- public/views/preferencesEmail.html | 2 +- public/views/preferencesHub.html | 2 +- public/views/preferencesInformation.html | 4 +- public/views/preferencesTor.html | 2 +- public/views/recoveryFromSeed.html | 2 +- public/views/splash.html | 8 +-- public/views/translators.html | 4 +- public/views/walletHome.html | 59 ++++++++++--------- src/css/main.css | 33 ++++++++--- src/css/mobile.css | 22 ++++--- 33 files changed, 117 insertions(+), 90 deletions(-) diff --git a/public/partialClient.html b/public/partialClient.html index 8b4b3a381..81b439e7f 100644 --- a/public/partialClient.html +++ b/public/partialClient.html @@ -32,7 +32,7 @@

+ style="color: '#E4E8EC';">

@@ -50,7 +50,7 @@
S + style="background-color: '#E4E8EC';">

@@ -78,4 +78,4 @@
-
\ No newline at end of file +
diff --git a/public/views/acceptCorrespondentInvitation.html b/public/views/acceptCorrespondentInvitation.html index 63c0708d2..90a62a4e6 100644 --- a/public/views/acceptCorrespondentInvitation.html +++ b/public/views/acceptCorrespondentInvitation.html @@ -45,7 +45,7 @@

Enter the pairing code received from the other device, or use your camera (icon at the upper right corner) to scan the QR code displayed on the other device. -
{{error|translate}}
+
{{error|translate}}
diff --git a/public/views/backup.html b/public/views/backup.html index e9d29759f..f54a77d87 100644 --- a/public/views/backup.html +++ b/public/views/backup.html @@ -83,7 +83,7 @@

-
+
Once you have written your wallet seed down, it is recommended to delete it from this device. diff --git a/public/views/copayers.html b/public/views/copayers.html index 00e49817b..57ebd3308 100644 --- a/public/views/copayers.html +++ b/public/views/copayers.html @@ -28,7 +28,7 @@

-

+

Waiting...

diff --git a/public/views/correspondentDevice.html b/public/views/correspondentDevice.html index 2c5890b04..c53760387 100644 --- a/public/views/correspondentDevice.html +++ b/public/views/correspondentDevice.html @@ -306,7 +306,7 @@

+
@@ -319,7 +319,7 @@

-
{{error|translate}}
+
{{error|translate}}
diff --git a/public/views/correspondentDevices.html b/public/views/correspondentDevices.html index 35b4f2cfa..e49d6c86e 100644 --- a/public/views/correspondentDevices.html +++ b/public/views/correspondentDevices.html @@ -49,7 +49,7 @@ .bots-orders-list.f-dropdown li, .contacts-orders-list.f-dropdown li { fo5nt-size: 12px } - + .contacts-orders-list.f-dropdown li a .check, .bots-orders-list.f-dropdown li a .check { position: inherit; } @@ -150,13 +150,13 @@
  • - Add a new device + Add a new device
  • - Remove a device + Remove a device
  • @@ -195,9 +195,9 @@

    -
    {{botsError|translate}}
    +
    {{botsError|translate}}

    -
    \ No newline at end of file +
    diff --git a/public/views/editCorrespondentDevice.html b/public/views/editCorrespondentDevice.html index 404d103e6..609517ea8 100644 --- a/public/views/editCorrespondentDevice.html +++ b/public/views/editCorrespondentDevice.html @@ -38,7 +38,7 @@

    -
    {{error|translate}}
    +
    {{error|translate}}
    Rename: Change hub: diff --git a/public/views/export.html b/public/views/export.html index c57b78659..678cbb6f1 100644 --- a/public/views/export.html +++ b/public/views/export.html @@ -52,7 +52,7 @@

    -
    +
    WARNING:
    • If you plan to restore the wallet on another device, stop using it on the current one immediately after creating the backup. Never clone wallets. If you need access from several devices, use multisig.
    • diff --git a/public/views/import.html b/public/views/import.html index 69da4d34f..86e1ae044 100644 --- a/public/views/import.html +++ b/public/views/import.html @@ -40,7 +40,7 @@

      value="{{'Import'|translate}}" ng-style="{'background-color':index.backgroundColor}">
    -
    +
    WARNINGS:
    • This will permanently delete all your existing wallets!
    • diff --git a/public/views/includes/copayers.html b/public/views/includes/copayers.html index 3bdcf5104..1b28f2e7f 100644 --- a/public/views/includes/copayers.html +++ b/public/views/includes/copayers.html @@ -3,7 +3,7 @@ {{'Me'|translate}} - + {{copayer.name}} ({{copayer.device_address.substr(0,4)}}...) diff --git a/public/views/includes/password.html b/public/views/includes/password.html index 04611aa23..5e11fc92a 100644 --- a/public/views/includes/password.html +++ b/public/views/includes/password.html @@ -13,7 +13,7 @@ Enter your password -
      {{index.askPassword.error|translate}}
      +
      {{index.askPassword.error|translate}}
      @@ -35,7 +35,7 @@
    -

    +

    Your wallet key will be encrypted. Password cannot be recovered. Be sure to write it down

    diff --git a/public/views/includes/topbar.html b/public/views/includes/topbar.html index 85329dc93..e5ee6e518 100644 --- a/public/views/includes/topbar.html +++ b/public/views/includes/topbar.html @@ -19,10 +19,11 @@

    -

    +

    {{(titleSection|translate) || (index.shared_address || index.alias || index.walletName)}} - + {{(index.shared_address || index.alias || index.walletName)}} diff --git a/public/views/includes/transaction.html b/public/views/includes/transaction.html index cdc76a55e..924a909a8 100644 --- a/public/views/includes/transaction.html +++ b/public/views/includes/transaction.html @@ -8,7 +8,7 @@
    Send {{tx.amountStr}} - +
    diff --git a/public/views/modals/destination-address.html b/public/views/modals/destination-address.html index 87700b90f..ce45e3968 100644 --- a/public/views/modals/destination-address.html +++ b/public/views/modals/destination-address.html @@ -106,7 +106,7 @@

    Add a new entry

    -
    {{error|translate}}
    +
    {{error|translate}}
    diff --git a/public/views/modals/offer-contract.html b/public/views/modals/offer-contract.html index 4decb3410..76d3b370f 100644 --- a/public/views/modals/offer-contract.html +++ b/public/views/modals/offer-contract.html @@ -113,7 +113,7 @@

    Who signs:

    • - + {{'Me'|translate}}
      diff --git a/public/views/modals/select-subwallet.html b/public/views/modals/select-subwallet.html index 2dd2756c7..bb6da1c6a 100644 --- a/public/views/modals/select-subwallet.html +++ b/public/views/modals/select-subwallet.html @@ -34,8 +34,8 @@

      {{sw.totalStr}} {{sw.total.toLocaleString()}}

      -
      with {{sw.shared_address_cosigners}}
      -
      +
      with {{sw.shared_address_cosigners}}
      +
      created diff --git a/public/views/modals/vote.html b/public/views/modals/vote.html index dd2d46303..4e7813c7d 100644 --- a/public/views/modals/vote.html +++ b/public/views/modals/vote.html @@ -49,6 +49,6 @@

      Who signs:

      -
      The vote will be signed by all your funded addresses
      +
      The vote will be signed by all your funded addresses
    diff --git a/public/views/paperWallet.html b/public/views/paperWallet.html index a4d277e4f..22ac4e347 100644 --- a/public/views/paperWallet.html +++ b/public/views/paperWallet.html @@ -37,7 +37,7 @@ Passphrase -

    +

    Decrypting a paper wallet could take around 5 minutes on this device. please be patient and keep the app open.

    @@ -70,7 +70,7 @@

    Funds found

    -
    +
    Funds will be transferred to: {{index.alias || index.walletName}} diff --git a/public/views/preferencesAlias.html b/public/views/preferencesAlias.html index 622d285af..0ccf1df1a 100644 --- a/public/views/preferencesAlias.html +++ b/public/views/preferencesAlias.html @@ -13,7 +13,7 @@

    -
    Changing wallet alias only affects the local wallet name. +
    Changing wallet alias only affects the local wallet name.
    diff --git a/public/views/preferencesDeviceName.html b/public/views/preferencesDeviceName.html index 53c30d6b7..d96c10358 100644 --- a/public/views/preferencesDeviceName.html +++ b/public/views/preferencesDeviceName.html @@ -13,7 +13,7 @@

    -
    Device name is visible to other devices you communicate with. +
    Device name is visible to other devices you communicate with.
    diff --git a/public/views/preferencesEditAttestorAddress.html b/public/views/preferencesEditAttestorAddress.html index 77449af2a..7508ca4f3 100644 --- a/public/views/preferencesEditAttestorAddress.html +++ b/public/views/preferencesEditAttestorAddress.html @@ -8,7 +8,7 @@

    -
    {{ctrl.error|translate}}
    +
    {{ctrl.error|translate}}

    -
    {{ctrl.error|translate}}
    +
    {{ctrl.error|translate}}
    -
    The hub for receiving messages from other devices. +
    The hub for receiving messages from other devices.
    diff --git a/public/views/preferencesInformation.html b/public/views/preferencesInformation.html index 2d448c653..c6f3b6ff8 100644 --- a/public/views/preferencesInformation.html +++ b/public/views/preferencesInformation.html @@ -75,7 +75,7 @@

    Co-signers

    {{'Me'|translate}} - + {{copayer.name}} @@ -97,7 +97,7 @@

    All Wallet Addresses

    {{a.address}}
    -
    +
    {{a.path}} · {{a.createdOn *1000 | amDateFormat:'MMMM Do YYYY, h:mm a' }}
    diff --git a/public/views/preferencesTor.html b/public/views/preferencesTor.html index acce43f09..8695ec98d 100644 --- a/public/views/preferencesTor.html +++ b/public/views/preferencesTor.html @@ -14,7 +14,7 @@

    -
    {{errorPortInput}}
    +
    {{errorPortInput}}
    diff --git a/public/views/recoveryFromSeed.html b/public/views/recoveryFromSeed.html index e0e8d6e3f..e59caba6e 100644 --- a/public/views/recoveryFromSeed.html +++ b/public/views/recoveryFromSeed.html @@ -33,7 +33,7 @@

    -
    +
    WARNINGS:
    • This will permanently delete all your existing wallets!
    • diff --git a/public/views/splash.html b/public/views/splash.html index 6c6c54fb5..c61da6b8e 100644 --- a/public/views/splash.html +++ b/public/views/splash.html @@ -40,7 +40,7 @@

    -
    @@ -60,7 +60,7 @@
    -
    +
    {{splash.error|translate}}. Retrying...
    @@ -82,14 +82,14 @@ -

    Your wallet will be created on this device, keep it safe. See your backup options in the Settings menu.

    Also in the Settings menu, you will find security options such as setting a password.

    -
    diff --git a/public/views/translators.html b/public/views/translators.html index d58c91264..dacc4d91f 100644 --- a/public/views/translators.html +++ b/public/views/translators.html @@ -48,11 +48,11 @@

    Translation Credits

    -

    +

    All contributions to Obyte's translation are welcome. Sign up at crowdin.com and join the Obyte project at https://crowdin.com/project/byteball.

    - + Don't see your language on Crowdin? Contact the Owner on Crowdin! We'd love to support your language.
    diff --git a/public/views/walletHome.html b/public/views/walletHome.html index ed1fedbbb..2d4eab4e6 100644 --- a/public/views/walletHome.html +++ b/public/views/walletHome.html @@ -12,9 +12,10 @@ } #send .mtab-title, .modal-content .mtab-title { padding: 5px; - font-weight: bold; - font-size: 11px; + /* font-weight: bold; */ + font-size: 12px; text-transform: uppercase; + text-align: center; } #send .mtab-title.active, .modal-content .mtab-title.active { color: #34495E; @@ -110,10 +111,12 @@
    {{home.testnetName}}
    -
    +
    - {{index.updateError|translate}} + {{index.updateError|translate}}
    @@ -188,7 +191,7 @@ ng-style="{'background-color':index.backgroundColor}">{{ (index.alias || index.walletName) | limitTo: 1}}
    - + Preferences @@ -197,11 +200,11 @@ Definition
    -
    -

    +

    +

    {{(index.alias || index.walletName)}}
    Smart wallet: {{index.shared_address | limitTo: 6}}...

    -
    +
    @@ -217,7 +220,7 @@

    Unsen ng-include="index.txTemplateUrl">

    -
    Total Locked Balance: {{index.lockedBalanceStr}} @@ -293,7 +296,7 @@

    Share address

    -
    +
    This address is shared with {{index.shared_address_cosigners}}. Share this wallet address to receive payments. To protect your privacy, new addresses are generated automatically once you use them. @@ -356,10 +359,10 @@

    {{home.error|translate}} - + ×
    - +
    @@ -428,11 +431,11 @@

    - - + +

    - @@ -650,7 +653,7 @@

    -

    Could not fetch transaction history

    +

    Could not fetch transaction history

    @@ -669,12 +672,12 @@

    -
    +
    Initial transaction history synchronization can take some minutes for wallets with many transactions.
    Please stand by.
    - {{index.txProgress}} + {{index.txProgress}} Transactions
    Downloaded
    @@ -704,7 +707,7 @@

    -
    +
    @@ -718,7 +721,7 @@

    Note: {{btx.message}}
    - To: {{index.addressbook[btx.addressTo] || btx.addressTo}} + To: {{index.addressbook[btx.addressTo] || btx.addressTo}}
    {{index.getToAddressLabel(btx.textAddress || btx.original_address)}}: {{index.getAddressValue(btx.textAddress || btx.original_address)}} @@ -740,7 +743,7 @@

    - +
    From c362aa81e61fb8e89d4e3d3d58669268681b5344 Mon Sep 17 00:00:00 2001 From: jerome Date: Mon, 8 Jul 2019 17:21:56 -0700 Subject: [PATCH 03/22] fixe more spacing issues --- public/views/walletHome.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/views/walletHome.html b/public/views/walletHome.html index 4ecaaba06..df0338231 100644 --- a/public/views/walletHome.html +++ b/public/views/walletHome.html @@ -116,7 +116,7 @@ style="background-image: linear-gradient( rgb(124, 194, 276), rgb(44, 124, 206));">
    - {{index.updateError|translate}} + {{index.updateError|translate}}
    @@ -220,7 +220,7 @@

    Unsen ng-include="index.txTemplateUrl">

    -
    Total Locked Balance: {{index.lockedBalanceStr}} From 6417775fa9cec431dc021809b2335de68ebe1853 Mon Sep 17 00:00:00 2001 From: jerome Date: Tue, 30 Jul 2019 15:48:04 -0700 Subject: [PATCH 04/22] css/templates revision - fix headers spacing - improve color selection - button are more proportionated (smaller) - use correct color with gradient in homepage headers - more margin tweaks --- .../views/acceptCorrespondentInvitation.html | 14 ++++---- public/views/addCorrespondentDevice.html | 14 ++++---- public/views/backup.html | 6 ++-- public/views/bot.html | 8 ++--- public/views/create.html | 8 ++--- public/views/export.html | 2 +- public/views/import.html | 2 +- public/views/inviteCorrespondentDevice.html | 14 ++++---- public/views/preferences.html | 17 +++++----- public/views/preferencesAdvanced.html | 19 +++++------ public/views/preferencesAlias.html | 2 +- public/views/preferencesBbUnit.html | 6 ++-- public/views/preferencesColor.html | 12 +++---- public/views/preferencesDeleteWallet.html | 6 ++-- public/views/preferencesDeviceName.html | 2 +- .../views/preferencesEditAttestorAddress.html | 2 +- .../preferencesEditRealNameAttestors.html | 6 ++-- public/views/preferencesEditWitness.html | 2 +- public/views/preferencesEmail.html | 6 ++-- public/views/preferencesGlobal.html | 27 +++++++-------- public/views/preferencesHub.html | 2 +- public/views/preferencesLanguage.html | 8 ++--- public/views/preferencesLogs.html | 10 +++--- public/views/preferencesTor.html | 2 +- public/views/preferencesUnit.html | 6 ++-- public/views/recoveryFromSeed.html | 2 +- public/views/walletHome.html | 17 ++++++---- src/css/main.css | 33 +++++++++++++++--- src/css/mobile.css | 20 +++++++---- src/js/services/configService.js | 34 +++++++++---------- 30 files changed, 171 insertions(+), 138 deletions(-) diff --git a/public/views/acceptCorrespondentInvitation.html b/public/views/acceptCorrespondentInvitation.html index 90a62a4e6..660339184 100644 --- a/public/views/acceptCorrespondentInvitation.html +++ b/public/views/acceptCorrespondentInvitation.html @@ -27,7 +27,7 @@

    @@ -46,22 +46,22 @@

    Enter the pairing code received from the other device, or use your camera (icon at the upper right corner) to scan the QR code displayed on the other device.
    {{error|translate}}
    - +
    -

    - +
    -
    \ No newline at end of file +
    diff --git a/public/views/addCorrespondentDevice.html b/public/views/addCorrespondentDevice.html index b0767f2bb..58c1de4ae 100644 --- a/public/views/addCorrespondentDevice.html +++ b/public/views/addCorrespondentDevice.html @@ -1,5 +1,5 @@ -
    @@ -10,15 +10,15 @@

    - +
    @@ -65,7 +65,7 @@

    - {{word}}  + {{word}} 
    @@ -89,7 +89,7 @@

    - +
    -
    \ No newline at end of file +
    diff --git a/public/views/create.html b/public/views/create.html index 48d1f1182..4aaadf0f4 100644 --- a/public/views/create.html +++ b/public/views/create.html @@ -53,7 +53,7 @@
    -
    - - diff --git a/public/views/export.html b/public/views/export.html index 678cbb6f1..1806fa896 100644 --- a/public/views/export.html +++ b/public/views/export.html @@ -6,7 +6,7 @@
    -

    +
    diff --git a/public/views/import.html b/public/views/import.html index 86e1ae044..e6856dbac 100644 --- a/public/views/import.html +++ b/public/views/import.html @@ -5,7 +5,7 @@
    -

    +
    diff --git a/public/views/inviteCorrespondentDevice.html b/public/views/inviteCorrespondentDevice.html index 3e01f60ce..7d48483ad 100644 --- a/public/views/inviteCorrespondentDevice.html +++ b/public/views/inviteCorrespondentDevice.html @@ -6,9 +6,9 @@ -
    +
    + -
    @@ -28,17 +28,17 @@
    -
    - +
    - +
    -
    \ No newline at end of file +
    diff --git a/public/views/preferences.html b/public/views/preferences.html index 6afe828e5..7475d9726 100644 --- a/public/views/preferences.html +++ b/public/views/preferences.html @@ -1,6 +1,6 @@ -
    @@ -8,7 +8,6 @@
    -

      @@ -23,9 +22,9 @@

    • - + -
      +
    Color
    @@ -45,11 +44,11 @@

  • - {{preferences.externalSource}} + {{preferences.externalSource}}
    Hardware wallet
    -
  • +

    @@ -60,9 +59,9 @@

    - +
  • - +
    Advanced
  • diff --git a/public/views/preferencesAdvanced.html b/public/views/preferencesAdvanced.html index bbdd86246..a4d380fbd 100644 --- a/public/views/preferencesAdvanced.html +++ b/public/views/preferencesAdvanced.html @@ -1,36 +1,35 @@ -
    -

    +
    • - +
      Wallet Information
    • - +
      Sweep paper wallet
    • - + - +
    • - +
      Delete Wallet
    - diff --git a/public/views/preferencesAlias.html b/public/views/preferencesAlias.html index 0ccf1df1a..7b26478a9 100644 --- a/public/views/preferencesAlias.html +++ b/public/views/preferencesAlias.html @@ -7,7 +7,7 @@
    -

    +
    diff --git a/public/views/preferencesBbUnit.html b/public/views/preferencesBbUnit.html index 1d55e3470..bd6f11266 100644 --- a/public/views/preferencesBbUnit.html +++ b/public/views/preferencesBbUnit.html @@ -1,5 +1,5 @@ -
    @@ -8,7 +8,7 @@
    -

    +
    • {{unit.shortName}} diff --git a/public/views/preferencesColor.html b/public/views/preferencesColor.html index d55085227..fbcf2b569 100644 --- a/public/views/preferencesColor.html +++ b/public/views/preferencesColor.html @@ -1,5 +1,5 @@ -
      @@ -7,11 +7,11 @@
      -

        -
      • - - +
      • + + {{c.colorName}} +
      diff --git a/public/views/preferencesDeleteWallet.html b/public/views/preferencesDeleteWallet.html index bb60c0529..ed16c83bd 100644 --- a/public/views/preferencesDeleteWallet.html +++ b/public/views/preferencesDeleteWallet.html @@ -7,8 +7,8 @@
      -

      -
      + +
      Wallet: {{index.walletName}} ({{index.alias}})
      @@ -19,7 +19,7 @@

      Warn

      -

      Permanently delete this wallet. THIS ACTION CANNOT BE REVERSED

      +

      Permanently delete this wallet.
      THIS ACTION CANNOT BE REVERSED

      diff --git a/public/views/preferencesDeviceName.html b/public/views/preferencesDeviceName.html index d96c10358..a6ddadd6a 100644 --- a/public/views/preferencesDeviceName.html +++ b/public/views/preferencesDeviceName.html @@ -7,7 +7,7 @@
      -

      + diff --git a/public/views/preferencesEditAttestorAddress.html b/public/views/preferencesEditAttestorAddress.html index 7508ca4f3..85540180e 100644 --- a/public/views/preferencesEditAttestorAddress.html +++ b/public/views/preferencesEditAttestorAddress.html @@ -6,7 +6,7 @@
      -

      +
      {{ctrl.error|translate}}
      diff --git a/public/views/preferencesEditRealNameAttestors.html b/public/views/preferencesEditRealNameAttestors.html index 5892671c3..380cbf1de 100644 --- a/public/views/preferencesEditRealNameAttestors.html +++ b/public/views/preferencesEditRealNameAttestors.html @@ -6,7 +6,7 @@
      -

      +
      {{ctrl.error|translate}}
      @@ -21,8 +21,8 @@

      - - Add address + + Add address
      diff --git a/public/views/preferencesEditWitness.html b/public/views/preferencesEditWitness.html index 7979b6761..6172acfb1 100644 --- a/public/views/preferencesEditWitness.html +++ b/public/views/preferencesEditWitness.html @@ -7,7 +7,7 @@
      -

      +
      {{ewc.error|translate}}
      diff --git a/public/views/preferencesEmail.html b/public/views/preferencesEmail.html index eba845217..8d37e0f90 100644 --- a/public/views/preferencesEmail.html +++ b/public/views/preferencesEmail.html @@ -1,5 +1,5 @@ -
      @@ -8,7 +8,7 @@
      -

      +
      diff --git a/public/views/preferencesGlobal.html b/public/views/preferencesGlobal.html index 00eec2ec2..09be887e3 100644 --- a/public/views/preferencesGlobal.html +++ b/public/views/preferencesGlobal.html @@ -1,13 +1,12 @@ -
      -

      • @@ -63,26 +62,26 @@

      - +

      Trusted nodes

      • - +
        Witnesses
      • - +
        Attestor addresses
      - +

      Device address

      • {{prefGlobal.myDeviceAddress}}
      - +

      Spending Restrictions

      • @@ -94,9 +93,9 @@

        Spending Restrictions

        Spend unconfirmed funds
      - +

      Backups

      - +
      • @@ -117,7 +116,7 @@

        Backups

        Recovery from seed
      - +
      • @@ -126,7 +125,7 @@

        Backups

        Full backup
      - +
      • @@ -135,11 +134,11 @@

        Backups

        Restore from full backup
      - +

      • - +
        About Obyte
      diff --git a/public/views/preferencesHub.html b/public/views/preferencesHub.html index 1e7486488..dd687c30b 100644 --- a/public/views/preferencesHub.html +++ b/public/views/preferencesHub.html @@ -7,7 +7,7 @@
      -

      + diff --git a/public/views/preferencesLanguage.html b/public/views/preferencesLanguage.html index 64e94caef..7923ded3c 100644 --- a/public/views/preferencesLanguage.html +++ b/public/views/preferencesLanguage.html @@ -1,5 +1,5 @@ -
      @@ -7,10 +7,10 @@
      -

      +
      • {{lang.name}} diff --git a/public/views/preferencesLogs.html b/public/views/preferencesLogs.html index a8530cfbf..810108b54 100644 --- a/public/views/preferencesLogs.html +++ b/public/views/preferencesLogs.html @@ -1,5 +1,5 @@ -
        @@ -7,18 +7,18 @@
        -

        +
        • - + {{l.msg}}
        • diff --git a/public/views/preferencesTor.html b/public/views/preferencesTor.html index 8695ec98d..f9a9b3e89 100644 --- a/public/views/preferencesTor.html +++ b/public/views/preferencesTor.html @@ -5,7 +5,7 @@
        -

        +
        diff --git a/public/views/preferencesUnit.html b/public/views/preferencesUnit.html index aca4b087f..8c95a127e 100644 --- a/public/views/preferencesUnit.html +++ b/public/views/preferencesUnit.html @@ -1,5 +1,5 @@ -
        @@ -8,7 +8,7 @@
        -

        +
        • {{unit.shortName}} diff --git a/public/views/recoveryFromSeed.html b/public/views/recoveryFromSeed.html index e59caba6e..6e00f3dee 100644 --- a/public/views/recoveryFromSeed.html +++ b/public/views/recoveryFromSeed.html @@ -5,7 +5,7 @@
        -

        +
        diff --git a/public/views/walletHome.html b/public/views/walletHome.html index df0338231..5891837b7 100644 --- a/public/views/walletHome.html +++ b/public/views/walletHome.html @@ -111,12 +111,15 @@
        {{home.testnetName}}
        -
        +
        +
        +
        - {{index.updateError|translate}} + {{index.updateError|translate}}
        @@ -159,7 +162,7 @@ - +
        @@ -281,7 +282,7 @@

        - - +

        -
        \ No newline at end of file +
        diff --git a/public/views/modals/destination-address.html b/public/views/modals/destination-address.html index ce45e3968..49964a0bc 100644 --- a/public/views/modals/destination-address.html +++ b/public/views/modals/destination-address.html @@ -32,7 +32,6 @@

        Edit @@ -40,14 +39,14 @@

        Done -

      diff --git a/public/views/preferencesInformation.html b/public/views/preferencesInformation.html index c6f3b6ff8..87019bc62 100644 --- a/public/views/preferencesInformation.html +++ b/public/views/preferencesInformation.html @@ -1,5 +1,5 @@ -
      @@ -17,8 +17,8 @@

      Wallet Information

    • - Wallet Id - + Wallet Id
      + {{walletId}}
    • @@ -60,7 +60,7 @@

      Wallet Information

      No private key - +
    • Account ({{derivationStrategy}}) @@ -90,12 +90,12 @@

      Extended Public Keys

    - +

      All Wallet Addresses

    • - {{a.address}} + {{a.address}}
      {{a.path}} · {{a.createdOn *1000 | amDateFormat:'MMMM Do YYYY, h:mm a' }} @@ -117,15 +117,15 @@

      Balance By Address

  • -
  • - + @@ -750,16 +771,16 @@

    -
    +
    - diff --git a/src/css/main.css b/src/css/main.css index 90146d0bb..a555f1b24 100644 --- a/src/css/main.css +++ b/src/css/main.css @@ -619,6 +619,8 @@ ul.manage li { font-size: 14px; font-weight: 400; padding-top: 0 !important; + color: #2C3E50; + } .tab-bar h1, .tab-bar h2, .tab-bar h3, .tab-bar h4, .tab-bar h5, .tab-bar h6 { @@ -626,6 +628,7 @@ ul.manage li { line-height: 3rem; /* tested on mac and win */ padding:0px; color: #ffffff !important; + font-weight: bold !important;; } .wallet-settings{ @@ -705,11 +708,12 @@ input[type=number]::-webkit-outer-spin-button { .label.success {background-color: #1ABC9C;} .label.alert {background-color: #ED4A43;} -.label.gray {background-color: #4B6178;} +.label.gray {background-color: #4B6178;padding: 10px;} .label.light-gray {background-color: #7A8C9E;;} .history .label { - width: 57px; + width: 75px; + padding:10px; text-align: center; font-size: 65%; overflow: hidden; @@ -1692,3 +1696,11 @@ a.suggest-command { padding-top: .8rem; padding-bottom: .8rem; } + +.message-log { + padding:10px; +} + +.label .gray .radius{ + padding: 10px; +} diff --git a/src/css/mobile.css b/src/css/mobile.css index b0a5b1086..3962df63f 100644 --- a/src/css/mobile.css +++ b/src/css/mobile.css @@ -223,8 +223,8 @@ _:-ms-fullscreen, :root .main { .walletHome .wallet-info { margin-left: 85px; + margin-bottom: 25px; line-height: 110%; - height: 60px; overflow: hidden; } From 06278505b4b48f168623cbcad8db300a7206a38c Mon Sep 17 00:00:00 2001 From: Jerome Lacote Date: Fri, 20 Dec 2019 20:50:13 -0800 Subject: [PATCH 09/22] Update address-definition.html add back enable_text_select --- public/views/modals/address-definition.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/views/modals/address-definition.html b/public/views/modals/address-definition.html index 13613b5b3..7bfab0be4 100644 --- a/public/views/modals/address-definition.html +++ b/public/views/modals/address-definition.html @@ -13,7 +13,7 @@