BTCPrivate
/
copay
mirror of https://github.com/BTCPrivate/copay.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #479 from bitjson/wip/design 

design polish
This commit is contained in:
Matias Alejo Garcia 2016-10-16 08:21:39 -03:00 committed by GitHub
parent 41b8547cf7 df4e86839f
commit 65dc3d24c0
6 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app-template/config-template.xml
View File

@ -16,7 +16,8 @@
<preference name="iosPersistentFileLocation" value="Library" />
<preference name="DisallowOverscroll" value="true"/>
<preference name="HideKeyboardFormAccessoryBar" value="true"/>
<preference name="KeyboardDisplayRequiresUserAction" value="false" />
<!-- #355 -->
<!-- <preference name="KeyboardDisplayRequiresUserAction" value="false" /> -->
<preference name="StatusBarBackgroundColor" value="#1e3186" />
<preference name="BackupWebStorage" value="none"/>
<preference name="windows-target-version" value="8.1"/>

2
src/sass/variables.scss
View File

@ -25,7 +25,7 @@ $font-size-small: 12px;
$font-family-sans-serif: $roboto;
$font-family-light-sans-serif: $roboto-light;
$button-border-radius: $visible-radius;
$button-border-radius: $subtle-radius;
$button-height: 52px;
$button-padding: 16px;

14
src/sass/views/integrations/glidera.scss Normal file
View File

@ -0,0 +1,14 @@
#glidera {
.glidera-lead {
margin: 1rem;
color: $mid-gray;
font-size: 18px;
text-align: center;
}
.disclosure {
color: $mid-gray;
font-size: 12px;
text-align: left;
margin: 1rem;
}
}

3
src/sass/views/views.scss
View File

@ -30,4 +30,5 @@
@import "includes/txp-details";
@import "includes/tx-status";
@import "includes/walletSelector";
@import "integrations/coinbase.scss";
@import "integrations/coinbase";
@import "integrations/glidera";

BIN
www/img/glidera-logo.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 8.5 KiB

After

Width:  |  Height:  |  Size: 8.0 KiB

12
www/views/glidera.html
View File

@ -1,4 +1,4 @@
<ion-view>
<ion-view id="glidera">
<ion-nav-bar class="bar-royal">
<ion-nav-back-button>
</ion-nav-back-button>
@ -22,20 +22,20 @@
<img src="img/glidera-logo.png" ng-click="update(token, permissions)" width="200">
</div>
<div class="text-center small-10 small-centered columns" ng-show="!showOauthForm">
<p class="m10b">You can buy and sell Bitcoin with a US bank account directly in Copay.</p>
<p class="glidera-lead">You can buy and sell Bitcoin with a US bank account directly in this app.</p>
<p class="m20t padding text-gray size-12 text-left">
<p class="disclosure">
DISCLOSURE.<br>
Glidera Inc. (Glidera) is providing the service of buying or selling bitcoins to Copay users. To enable this
Glidera Inc. (Glidera) is providing the service of buying or selling bitcoin to BitPay users. To enable this
service, Glidera has registered with US Treasury Department’s FinCEN as a Money Service Business
(#31000042625755). Users of Copay must agree to the service agreement presented by Glidera prior to obtaining
(#31000042625755). Users of BitPay must agree to the service agreement presented by Glidera prior to obtaining
Glidera’s service of buying or selling bitcoins. Service available in U.S. and Canada only. In U.S. (buy & sell) CA, GA, IL, KS,
MA, MD, MO, MT, MN, SC, TX, AZ, CO, DE, ME, NJ, PA, TN, UT, NV, WI. In Canada (buy & sell) AB, BC, MB, NB, NL, NS, NT, NU,
ON, PE, SK, YT.
</p>
<p class="m20t text-gray size-12">Connect your Glidera account to get started</p>
<button class="button button-block button-positive"
<button class="button button-standard button-primary"
ng-click="openExternalLink(glidera.getAuthenticateUrl()); showOauthForm = true">
Connect to Glidera
</button>