From fb9a6906f7c89eed80620399133e8daae39a0456 Mon Sep 17 00:00:00 2001 From: bechi Date: Thu, 10 Sep 2015 20:02:03 -0300 Subject: [PATCH 1/8] setup pages --- public/views/glidera.html | 123 +++++++++++++++++++++----------------- src/css/main.css | 6 ++ 2 files changed, 75 insertions(+), 54 deletions(-) diff --git a/public/views/glidera.html b/public/views/glidera.html index 218125c07..b8c975df7 100644 --- a/public/views/glidera.html +++ b/public/views/glidera.html @@ -22,27 +22,23 @@ -
-
-
- -
- +
+
{{index.glideraError}}
-
- @@ -56,17 +52,19 @@
+
+ + Testnet wallets only work with Glidera Sandbox Accounts +
-
-

You can buy and sell Bitcoin with a US bank account directly in Copay.

-
Connect your Glidera account to get started
+
+ +
+
+

You can buy and sell Bitcoin with a US bank account directly in Copay.

+

Connect your Glidera account to get started

-
- - Testnet wallets only work with Glidera Sandbox Accounts -
- - Connect to Glidera @@ -98,57 +96,74 @@
- -
-
- {{index.glideraEmail}} +
+ +
+
+
+
+ + {{index.glideraPersonalInfo.firstName}} {{index.glideraPersonalInfo.lastName}} + +
+
+ {{index.glideraEmail}} +
- -
- {{index.glideraPersonalInfo.firstName}} {{index.glideraPersonalInfo.lastName}} +
+
+ + + + +
- -
+
+
+

Complete Setup

Your Glidera account is not ready to transact. Please, verify it at Glidera.io +
-
    -
  • - - Buy Bitcoin +
    +
      +
    • + + Buy Bitcoin + + + +
      • +
    • + + Sell Bitcoin -
      • -
    • - - Sell Bitcoin - - - -
      • -
    • - Preferences - - - -
      • -
    +
    • +
-

Activity

diff --git a/src/css/main.css b/src/css/main.css index f71619032..965d9c8db 100644 --- a/src/css/main.css +++ b/src/css/main.css @@ -108,6 +108,12 @@ input:-webkit-autofill, textarea:-webkit-autofill, select:-webkit-autofill, inpu -webkit-box-shadow: 0 0 0px 1000px white inset; } +.sub-header { + background: #F1f3F5; + padding: 0.8rem; + overflow: hidden; +} + .status { color: #FFFFFF; background-color: #A02F23; From 95d68bc0a485ebc3e92b455cb1729c5c8c56c69b Mon Sep 17 00:00:00 2001 From: bechi Date: Fri, 11 Sep 2015 13:14:20 -0300 Subject: [PATCH 2/8] change glidera preferences --- public/views/modals/glidera-confirmation.html | 5 +++-- public/views/preferencesGlidera.html | 11 +++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/public/views/modals/glidera-confirmation.html b/public/views/modals/glidera-confirmation.html index 61bfa5c9c..500c1f72f 100644 --- a/public/views/modals/glidera-confirmation.html +++ b/public/views/modals/glidera-confirmation.html @@ -1,7 +1,7 @@
-

Are you sure you would like to log out of your Glidera account?

-

You will need to log back in to buy or sell bitcoin in Copay.

+

Are you sure you would like to log out of your Glidera account?

+

You will need to log back in to buy or sell bitcoin in Copay.

+
diff --git a/public/views/preferencesGlidera.html b/public/views/preferencesGlidera.html index ff8a0de7b..0df247905 100644 --- a/public/views/preferencesGlidera.html +++ b/public/views/preferencesGlidera.html @@ -1,5 +1,5 @@ -
@@ -34,7 +34,7 @@ -

    Email

    @@ -52,7 +52,7 @@
-

    Personal Information

    @@ -260,7 +260,6 @@ Log out
- +
- From e3e1871fa8aa7c231e54039a4af776638eaca253 Mon Sep 17 00:00:00 2001 From: bechi Date: Fri, 11 Sep 2015 14:18:33 -0300 Subject: [PATCH 3/8] fix line --- public/views/glidera.html | 34 ++++++++++++++++------------------ 1 file changed, 16 insertions(+), 18 deletions(-) diff --git a/public/views/glidera.html b/public/views/glidera.html index b8c975df7..481be9151 100644 --- a/public/views/glidera.html +++ b/public/views/glidera.html @@ -23,28 +23,26 @@
-
-
-
- {{index.glideraError}} -
+
+
+ {{index.glideraError}}
-
+
+
+ +
-
- -
- Preferences -
+
+ Preferences
From abdd8cb38fe1d474fd1ec737108f5a451b876864 Mon Sep 17 00:00:00 2001 From: bechi Date: Fri, 11 Sep 2015 14:58:59 -0300 Subject: [PATCH 4/8] fix button --- public/views/glidera.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/views/glidera.html b/public/views/glidera.html index 481be9151..415d67dbe 100644 --- a/public/views/glidera.html +++ b/public/views/glidera.html @@ -129,7 +129,7 @@ ng-click="$root.openExternalLink(glideraUrl)">Glidera.io -
From 5bce340a30bb29a4da3cfdfa86ef78d7364ce44d Mon Sep 17 00:00:00 2001 From: bechi Date: Fri, 11 Sep 2015 15:13:32 -0300 Subject: [PATCH 6/8] fix link --- public/views/glidera.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/views/glidera.html b/public/views/glidera.html index 415d67dbe..384176d0b 100644 --- a/public/views/glidera.html +++ b/public/views/glidera.html @@ -97,7 +97,7 @@
-
+
@@ -109,7 +109,7 @@
-
+
From c4fdda43e5f4315192a4ce392adcf7a8daade6ff Mon Sep 17 00:00:00 2001 From: bechi Date: Fri, 11 Sep 2015 15:30:58 -0300 Subject: [PATCH 7/8] remove link on the text --- public/views/glidera.html | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/public/views/glidera.html b/public/views/glidera.html index 384176d0b..26814e110 100644 --- a/public/views/glidera.html +++ b/public/views/glidera.html @@ -122,12 +122,7 @@ ng-show="index.glideraStatus && (!index.glideraStatus.userEmailIsSetup || !index.glideraStatus.userPhoneIsSetup || (!index.glideraStatus.userBankAccountIsSetup && index.glideraStatus.bankAccountState != 'VERIFIED'))">

Complete Setup

- Your Glidera account is not ready to transact. Please, verify it at - Glidera.io -
+
+

Preferences

+
{{index.glideraPersonalInfo.firstName}} {{index.glideraPersonalInfo.lastName}} @@ -134,29 +137,29 @@
-
-
    -
  • - - Buy Bitcoin - - - -
    • -
  • - - Sell Bitcoin +
      +
    • + + Buy Bitcoin -
      • -
    +
    • +
  • + + Sell Bitcoin + + + +
    • +
+

Activity