From 6746180782220f6938de823d1a3af198c62ed3c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gabriel=20Baz=C3=A1n?= Date: Wed, 2 Dec 2015 09:53:16 -0300 Subject: [PATCH] change terms view and taking out auto capitalize in join and create view when writting wallet seeds and passphrase --- public/views/create.html | 5 +++-- public/views/join.html | 5 +++-- public/views/termOfUse.html | 4 ++-- src/css/main.css | 15 +++++++++++++++ src/js/controllers/termOfUse.js | 8 ++++++++ 5 files changed, 31 insertions(+), 6 deletions(-) create mode 100644 src/js/controllers/termOfUse.js diff --git a/public/views/create.html b/public/views/create.html index a841dc748..e0254971e 100644 --- a/public/views/create.html +++ b/public/views/create.html @@ -134,7 +134,7 @@
@@ -145,6 +145,7 @@ Wallet Seed Enter the seed words (BIP39) @@ -153,7 +154,7 @@
diff --git a/public/views/join.html b/public/views/join.html index 3b3d97398..fce9954f4 100644 --- a/public/views/join.html +++ b/public/views/join.html @@ -116,7 +116,7 @@
@@ -127,6 +127,7 @@ Wallet Seed Enter the seed words (BIP39) @@ -135,7 +136,7 @@
diff --git a/public/views/termOfUse.html b/public/views/termOfUse.html index 506a2a3fa..9d91bc3c7 100644 --- a/public/views/termOfUse.html +++ b/public/views/termOfUse.html @@ -3,9 +3,9 @@ ng-include="'views/includes/topbar.html'" ng-init="titleSection='Terms of use'; goBackToState = 'about'; noColor = true">
-
+

-

+

diff --git a/src/css/main.css b/src/css/main.css index 9dd839587..226e08cb1 100644 --- a/src/css/main.css +++ b/src/css/main.css @@ -1175,6 +1175,21 @@ input.ng-invalid-match, input.ng-invalid-match:focus { } /*/////////////////////////////////////////////////*/ +.terms { + padding: 0.8rem; +} + +.terms ul { + font-size: 0.8rem; + text-align: justify; + margin-left: 0; +} + +.terms li { + list-style-type:none; + display: inline; +} + .scrollArea { height: 280px; overflow: scroll; diff --git a/src/js/controllers/termOfUse.js b/src/js/controllers/termOfUse.js new file mode 100644 index 000000000..846272e40 --- /dev/null +++ b/src/js/controllers/termOfUse.js @@ -0,0 +1,8 @@ +'use strict'; + +angular.module('copayApp.controllers').controller('termOfUseController', + function($scope, uxLanguage) { + + $scope.lang = uxLanguage.currentLanguage; + + });