keejef
/
session-desktop
mirror of https://github.com/oxen-io/session-desktop
2
0
Fork 0
Code Issues 8 Projects Releases Wiki Activity

Merge pull request #46 from codedust/optionsCssImprovements

Browse Source 
improved some css for options.html
pull/749/head
liliakai 11 years ago
parent cf35b7056f ce98f87d42
commit 9e5f96e17e
5 changed files with 42 additions and 28 deletions
Show Stats Download Patch File Download Diff File

6
css/buttons.css
Unescape Escape View File

@ -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;
}

4
css/forms.css
Unescape Escape View File

@ -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 {

21
options.css → css/options.css
Unescape Escape View File

@ -18,17 +18,24 @@
}
html {
margin: 12px 0 0 100px;
}
margin: 12px 0 0 100px; }
h1 {
font-size: 14pt;
font-size: 30pt;
font-weight: normal;
padding-bottom: 10px;
border-bottom: 1px solid #e0e0e0;
}
border-bottom: 1px solid #e0e0e0; }
h2 {
font-size: 12pt;
font-weight: normal;
}
font-weight: normal; }
.hidden {
display: none; }
#textsecure-icon {
width: 50px;
height: 50px; }
#init-go-single-client {
display:block; }

17
js/options.js
Unescape Escape View File

@ -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;

22
options.html
Unescape Escape View File

@ -15,27 +15,31 @@
<html>
<head>
<title>TextSecure Options</title>
<link rel="stylesheet" href="options.css">
<link rel="stylesheet" href="css/options.css">
<link rel="stylesheet" href="css/forms.css">
<link rel="stylesheet" href="css/buttons.css">
</head>
<body data-name="curve25519" data-tools="pnacl" data-configs="Debug Release" data-path="pnacl/{config}">
<div id="listener"></div>
<div id="log"></div>
<h1 style="font-size: 30pt;"><img src='icon.png' height='50px' width='50px'/> TextSecure</h1>
<div id="init-setup" style="display: none;">
<h1><img id="textsecure-icon" src='icon.png'/> TextSecure</h1>
<div id="init-setup" class="hidden">
<h2>Welcome to TextSecure. To get started please get a 6-digit setup code from your phone and enter it below.</h2>
Phone number (including country code): +<input type="text" size="2" id="countrycode" /><input type="text" size="8" id="number" /><br>
<button id="init-go-single-client" >Send single-client code</button><br>
Code: <input type="text" pattern="[0-9]{3}-?[0-9]{3}" title="Enter the 6-didgit verificaion code displayed on your phone." size="8" id="code" /><br>
<button id="init-go" >Sync</button>
<p>Phone number (including country code): +<input type="text" maxlength=3 size="3" id="countrycode" /> <input type="text" maxlength=14 size="14" id="number" /></p>
<button id="init-go-single-client" class="btn">Send single-client code</button>
<div id="init-setup-verification" class="hidden">
<p>Code: <input type="text" pattern="[0-9]{3}-?[0-9]{3}" title="Enter the 6-didgit verificaion code displayed on your phone." size="8" id="code" /></p>
<button id="init-go" class="btn">Sync</button>
</div>
</div>
<div id="verify" style="display: none;">
<div id="verify" class="hidden">
<div id="verify1">Verifying number and setup code...<span id="verify1done"></span></div>
<div id="verify2">Syncing with existing devices...<span id="verify2done"></span></div>
<div id="verify3">Generating keys...<span id="verify3done"></span></div>
<div id="verify4">Registering...<span id="verify4done"></span></div>
</div>
<div id="setup-complete" style="display: none;">
<div id="setup-complete" class="hidden">
<h2>You are now registered on TextSecure with number <span id="complete-number"></span></h2>
</div>
<script type="text/javascript" src="js-deps/nacl-common.js"></script>

Write Preview
Loading…
Cancel
Save