From 6869d909868245959f029ea955684ec1e0c81f73 Mon Sep 17 00:00:00 2001 From: Matias Alejo Garcia Date: Thu, 8 Oct 2015 11:58:55 -0300 Subject: [PATCH] fix pref styles --- public/views/backup.html | 5 +- public/views/paperWallet.html | 9 +-- public/views/preferences.html | 73 +++++++++++-------- public/views/preferencesAbout.html | 19 +++-- public/views/preferencesAdvanced.html | 18 +++-- public/views/preferencesAlias.html | 8 ++- public/views/preferencesAltCurrency.html | 8 ++- public/views/preferencesBwsUrl.html | 3 +- public/views/preferencesColor.html | 7 +- public/views/preferencesDeleteWallet.html | 6 +- public/views/preferencesEmail.html | 6 +- public/views/preferencesFee.html | 5 +- public/views/preferencesGlidera.html | 87 ++++++++++++----------- public/views/preferencesInformation.html | 12 +++- public/views/preferencesLanguage.html | 8 ++- public/views/preferencesLogs.html | 3 +- public/views/preferencesUnit.html | 7 +- src/css/main.css | 37 ++++++++++ 18 files changed, 200 insertions(+), 121 deletions(-) diff --git a/public/views/backup.html b/public/views/backup.html index 3942fbb1c..f3d85f9a8 100644 --- a/public/views/backup.html +++ b/public/views/backup.html @@ -5,7 +5,8 @@ -
+
+

@@ -82,7 +83,7 @@
-
+
{{word}}　
diff --git a/public/views/paperWallet.html b/public/views/paperWallet.html index 5d03fd02b..13c43d314 100644 --- a/public/views/paperWallet.html +++ b/public/views/paperWallet.html @@ -65,11 +65,12 @@ ng-click="paperWallet.sweepWallet()" translate>Sweep Wallet -
-
Funds will be transfered to
- {{index.alias || index.walletName}} -
+
+ Funds will be transfered to: + {{index.alias || index.walletName}} +
+
diff --git a/public/views/preferences.html b/public/views/preferences.html index 1221f7e11..3a46128c1 100644 --- a/public/views/preferences.html +++ b/public/views/preferences.html @@ -8,11 +8,11 @@
-
    -

    {{index.alias}} [{{index.walletName}}] settings

    +

    +
      -
    • +
    • Wallet Alias @@ -20,7 +20,7 @@
      • -
    • +
    • Email Notifications @@ -29,29 +29,25 @@
      • -
    • +
    • Color █
      • -
    • - Request Password for Spending Funds - -
      • -
    • - Request Touch ID for Spending Funds - -
      • -
    • + +
    • Hardware wallet {{preferences.externalSource}}
      • -
    • + +

      +

      +
    • Still not done @@ -59,37 +55,50 @@ Backup
      • -
    • +
    • Advanced
    -
      +

      + Spending Restrictions +

      +
        +
      • + Request Password + +
        • +
      • + Scan Fingerpring + +
        • +
      +
        -

        Global settings

        +

        Global settings

        -
      • +
      • Language {{preferences.currentLanguageName|translate}}
        • -
      • +
      • Unit {{preferences.unitName}}
        • -
      • +
      • Alternative Currency {{preferences.selectedAlternative.name}}
        • -
      • Bitcoin Network Fee Policy @@ -97,35 +106,37 @@ {{index.feeOpts[index.currentFeeLevel]|translate}}
        • -
      • +
      • Use Unconfirmed Funds
        • -
      • + +
      • + Enable Glidera Service + +
        • +
      • Bitcore Wallet Service {{preferences.bwsurl}}
        • - -
      • - Enable Glidera Service - -
        • + -
      • +
      • About Copay
      +

diff --git a/public/views/preferencesAbout.html b/public/views/preferencesAbout.html index bbca1b4fc..c584a6c46 100644 --- a/public/views/preferencesAbout.html +++ b/public/views/preferencesAbout.html @@ -5,17 +5,16 @@
-

Release Information

- +

Release Information

-
    -
  • +
      +
    • Version v{{v.version}}
      • -
    • +
    • Commit hash #{{v.commitHash}} @@ -24,17 +23,17 @@
-

 

-
    -
  • +

    +
      +
    • Terms of Use
      • -
    • +
    • Translators
      • -
    • +
    • Session log
      • diff --git a/public/views/preferencesAdvanced.html b/public/views/preferencesAdvanced.html index 95fe861d3..c5679b94f 100644 --- a/public/views/preferencesAdvanced.html +++ b/public/views/preferencesAdvanced.html @@ -6,28 +6,26 @@
      -
        +

        +
          -
        • + +
        • Wallet Information
          • -
        • - Scan addresses for funds -
          • - -
        • +
        • Sweep paper wallet
          • -
        • +
        • - Export + Export Wallet
          • -
        • +
        • Delete Wallet
          • diff --git a/public/views/preferencesAlias.html b/public/views/preferencesAlias.html index 629974aa6..8b526fe6a 100644 --- a/public/views/preferencesAlias.html +++ b/public/views/preferencesAlias.html @@ -4,13 +4,17 @@ ng-init="titleSection='Wallet Alias'; goBackToState = 'preferences'">
      -
      +
      + + +

      -

      Changing wallet alias only affects the local wallet name.

      +
      Changing wallet alias only affects the local wallet name. +
      diff --git a/public/views/preferencesAltCurrency.html b/public/views/preferencesAltCurrency.html index 4a2159ef1..19caee5da 100644 --- a/public/views/preferencesAltCurrency.html +++ b/public/views/preferencesAltCurrency.html @@ -7,10 +7,14 @@
      -
      + +

      +
        +
      • {{altCurrency.name}} -
      + +
      diff --git a/public/views/preferencesBwsUrl.html b/public/views/preferencesBwsUrl.html index 68504ecbe..92b9c3e6a 100644 --- a/public/views/preferencesBwsUrl.html +++ b/public/views/preferencesBwsUrl.html @@ -6,7 +6,8 @@ -
      +
      +

      diff --git a/public/views/preferencesColor.html b/public/views/preferencesColor.html index 0b7c74c4e..a26b2d4d4 100644 --- a/public/views/preferencesColor.html +++ b/public/views/preferencesColor.html @@ -7,9 +7,12 @@
      -
      +

      +
        +
      • █ -
      + +
diff --git a/public/views/preferencesDeleteWallet.html b/public/views/preferencesDeleteWallet.html index 16d3906c3..be1894c1f 100644 --- a/public/views/preferencesDeleteWallet.html +++ b/public/views/preferencesDeleteWallet.html @@ -5,8 +5,10 @@
-
-
+
+ +

+
Wallet: {{index.walletName}} ({{index.alias}})
diff --git a/public/views/preferencesEmail.html b/public/views/preferencesEmail.html index 0d3995724..e7d308fb8 100644 --- a/public/views/preferencesEmail.html +++ b/public/views/preferencesEmail.html @@ -6,8 +6,9 @@ -
+
+

diff --git a/public/views/preferencesFee.html b/public/views/preferencesFee.html index 2cf126cd1..5fed61128 100644 --- a/public/views/preferencesFee.html +++ b/public/views/preferencesFee.html @@ -4,9 +4,10 @@ ng-init="titleSection='Bitcoin Network Fee Policy'; goBackToState = 'preferences'; noColor = true">
-
    +

    +
    • + ng-click="prefFee.save(fee.level)"> {{index.feeOpts[fee.level]|translate}}
      • diff --git a/public/views/preferencesGlidera.html b/public/views/preferencesGlidera.html index d998d3034..2137d0060 100644 --- a/public/views/preferencesGlidera.html +++ b/public/views/preferencesGlidera.html @@ -5,28 +5,29 @@
+

-
    +

      Permissions

      -
    • +
    • Email {{index.glideraPermissions.view_email_address}}
      • -
    • +
    • Personal Information {{index.glideraPermissions.personal_info}}
      • -
    • +
    • Buy/Sell {{index.glideraPermissions.transact}}
      • -
    • +
    • Transaction History {{index.glideraPermissions.transaction_history}} @@ -36,15 +37,15 @@
        + class="no-bullet m0">

        Email

        -
      • +
      • Email {{glidera.email.email}}
        • -
      • +
      • Active {{glidera.email.userEmailIsSetup}} @@ -54,76 +55,76 @@
          + class="no-bullet m0">

          Personal Information

          -
        • +
        • First Name {{glidera.personalInfo.firstName}}
          • -
        • +
        • Middle Name {{glidera.personalInfo.middleName}}
          • -
        • +
        • Last Name {{glidera.personalInfo.lastName}}
          • -
        • +
        • Birth Date {{glidera.personalInfo.birthDate}}
          • -
        • +
        • Address 1 {{glidera.personalInfo.address1}}
          • -
        • +
        • Address 2 {{glidera.personalInfo.address2}}
          • -
        • +
        • City {{glidera.personalInfo.city}}
          • -
        • +
        • State {{glidera.personalInfo.state}}
          • -
        • +
        • ZIP Code {{glidera.personalInfo.zipCode}}
          • -
        • +
        • Country {{glidera.personalInfo.countryCode}}
          • -
        • +
        • Occupation {{glidera.personalInfo.occupation}}
          • -
        • +
        • Basic Information State {{glidera.personalInfo.basicInfoState}} @@ -132,59 +133,59 @@
          + class="no-bullet m0">

          Status

          -
        • +
        • Buy/Sell {{glidera.status.userCanTransact}}
          • -
        • +
        • Buy {{glidera.status.userCanBuy}}
          • -
        • +
        • Sell {{glidera.status.userCanSell}}
          • -
        • +
        • Email Is Setup {{glidera.status.userEmailIsSetup}}
          • -
        • +
        • Phone Is Setup {{glidera.status.userPhoneIsSetup}}
          • -
        • +
        • Bank Account Is Setup {{glidera.status.userBankAccountIsSetup}}
          • -
        • +
        • Personal Information State {{glidera.status.personalInfoState}}
          • -
        • +
        • Bank Account State {{glidera.status.bankAccountState}}
          • -
        • +
        • Country {{glidera.status.country}} @@ -193,58 +194,58 @@
          + class="no-bullet m0">

          Limits

          -
        • +
        • Daily Buy {{glidera.limits.dailyBuy|currency:'':2}} {{glidera.limits.currency}}
          • -
        • +
        • Daily Sell {{glidera.limits.dailySell|currency:'':2}} {{glidera.limits.currency}}
          • -
        • +
        • Monthly Buy {{glidera.limits.monthlyBuy|currency:'':2}} {{glidera.limits.currency}}
          • -
        • +
        • Monthly Sell {{glidera.limits.monthlySell|currency:'':2}} {{glidera.limits.currency}}
          • -
        • +
        • Daily Buy Remaining {{glidera.limits.dailyBuyRemaining|currency:'':2}} {{glidera.limits.currency}}
          • -
        • +
        • Daily Sell Remaining {{glidera.limits.dailySellRemaining|currency:'':2}} {{glidera.limits.currency}}
          • -
        • +
        • Monthly Buy Remaining {{glidera.limits.monthlyBuyRemaining|currency:'':2}} {{glidera.limits.currency}}
          • -
        • +
        • Monthly Sell Remaining {{glidera.limits.monthlySellRemaining|currency:'':2}} {{glidera.limits.currency}}
          • -
        • +
        • Buy/Sell Disabled (pending first transaction) {{glidera.limits.transactDisabledPendingFirstTransaction}} @@ -252,10 +253,10 @@
        -
          +

            Account

            -
          • +
          • Log out
            • diff --git a/public/views/preferencesInformation.html b/public/views/preferencesInformation.html index 08266c220..a7501887a 100644 --- a/public/views/preferencesInformation.html +++ b/public/views/preferencesInformation.html @@ -53,7 +53,7 @@

            Extended Public Keys

            -
          • +
          • Copayer {{$index}}
            @@ -68,7 +68,7 @@

              Last Wallet Addresses

              -
            • +
            • {{a.address}}
              @@ -82,6 +82,14 @@ Only Main (not change) addresses are shown. The addresses on this list were not verified locally at this time.
              • +
            • + +
              • + +
              • +
            diff --git a/public/views/preferencesLogs.html b/public/views/preferencesLogs.html index 459c354f7..c561c2668 100644 --- a/public/views/preferencesLogs.html +++ b/public/views/preferencesLogs.html @@ -6,7 +6,8 @@ -
            +
            +

            • +
diff --git a/src/css/main.css b/src/css/main.css index 0f3fdf3ef..88944e4cf 100644 --- a/src/css/main.css +++ b/src/css/main.css @@ -62,6 +62,43 @@ h4.title a { font-size: 12px; } +.preferences { + background: #f1f3f5; +} + +.preferences form { + background: white; + padding-top:10px; + margin-bottom: 10px; +} + +.preferences .switch { + top:-5px !important; +} + + +.preferences h4 { + background: #F1F3F5; + padding: 25px 0px 5px 20px; + text-transform: uppercase; + color: #777; + font-size: 10px; + font-weight:200; + margin:0; +} + + +.preferences ul { + font-size:14px; + background: white; +} + +.preferences ul li { + padding:10px 20px; + border-bottom: 1px solid #E9E9EC; +} + + body, html{ height:100%; width:100%;