anders/Wallet
1
0
Fork 0
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'ref/design' of https://github.com/bitpay/bitpay-wallet into feature/external_link_open_system_browser

Browse source 
# Conflicts:
#	www/views/glidera.html
This commit is contained in:
Jamal Jackson 2016-10-12 08:59:04 -04:00
commit 7becb504f4
59 changed files with 500 additions and 28777 deletions
Download patch file Download diff file Expand all files Collapse all files

3
www/views/glidera.html
View file

@ -35,7 +35,6 @@
</p>
<p class="m20t text-gray size-12">Connect your Glidera account to get started</p>
<button class="button button-block button-positive"
ng-click="openExternalLink(glidera.getAuthenticateUrl(), 'Glidera authentication'); showOauthForm = true">
Connect to Glidera
@ -65,7 +64,7 @@
</div>
<div class="col">
<input
class="button button-block button-positive"
class="button button-standard button-primary"
type="submit"
value="Get started"
ng-disabled="oauthCodeForm.$invalid">