From 5cddcb59aa496fea74f2385ec5a7cb524b5017ad Mon Sep 17 00:00:00 2001 From: Marco Date: Sun, 1 Jun 2014 22:22:34 +0200 Subject: [PATCH] improved some css for options.html --- css/buttons.css | 6 ++---- css/forms.css | 4 ++++ options.css => css/options.css | 4 ++++ js/options.js | 17 +++++++++-------- options.html | 14 +++++++++----- 5 files changed, 28 insertions(+), 17 deletions(-) rename options.css => css/options.css (95%) diff --git a/css/buttons.css b/css/buttons.css index 7809c84fa..d5853bb03 100644 --- a/css/buttons.css +++ b/css/buttons.css @@ -7,16 +7,14 @@ color: #7fd0ed; font-weight: bold; } -.btn:hover, .btn:focus { +.btn:hover { cursor: pointer; outline: none; -} -.btn:hover { background-color: #7fd0ed; border-color: #acdbf5; color: #fff; } -.btn:active { +.btn:active, .btn:focus { outline: 2px dashed #acdbf5; outline-offset: 2px; } diff --git a/css/forms.css b/css/forms.css index a6378d430..dc49b42a5 100644 --- a/css/forms.css +++ b/css/forms.css @@ -8,6 +8,10 @@ input[type=text], textarea { color: #333333; } +input.invalid { + background-color: #ff6666; + border-color: #ff3333; +} input[type=submit]:focus, input[type=text]:focus { diff --git a/options.css b/css/options.css similarity index 95% rename from options.css rename to css/options.css index af171a2b4..1502fa280 100644 --- a/options.css +++ b/css/options.css @@ -32,3 +32,7 @@ h2 { font-size: 12pt; font-weight: normal; } + +#init-go-single-client { + display:block; +} diff --git a/js/options.js b/js/options.js index 9711c29bf..a30e69c4a 100644 --- a/js/options.js +++ b/js/options.js @@ -17,18 +17,18 @@ function updateNumberColors() { try { textsecure.utils.verifyNumber($('#number').val(), $('#countrycode').val()); - $('#number').attr('style', ''); - $('#countrycode').attr('style', ''); + $('#number').removeClass('invalid'); + $('#number').removeClass('invalid'); } catch (e) { if (e.countryCodeValid) - $('#countrycode').attr('style', ''); + $('#countrycode').removeClass('invalid'); else - $('#countrycode').attr('style', 'background-color:#ff6666;'); + $('#countrycode').addClass('invalid'); if (e.numberValid) - $('#number').attr('style', ''); + $('#number').removeClass('invalid'); else - $('#number').attr('style', 'background-color:#ff6666;'); + $('#number').addClass('invalid'); } } @@ -42,9 +42,9 @@ function isCodeValid() { $('#code').on('change', function() { if (!isCodeValid()) - $('#code').attr('style', 'background-color:#ff6666;'); + $('#code').addClass('invalid'); else - $('#code').attr('style', ''); + $('#code').removeClass('invalid'); }); var single_device = false; @@ -56,6 +56,7 @@ $('#init-go-single-client').click(function() { $('#countrycode').prop('disabled', 'disabled'); $('#number').prop('disabled', 'disabled'); $('#init-go-single-client').prop('disabled', 'disabled'); + $('#init-setup-verification').show(); single_device = true; diff --git a/options.html b/options.html index 7be44e47b..31d596084 100644 --- a/options.html +++ b/options.html @@ -15,7 +15,9 @@ TextSecure Options - + + +
@@ -24,10 +26,12 @@

TextSecure