Skip to content

Commit

Permalink
fix(buttons, popup texts): Fixed some differences between buttons acr…
Browse files Browse the repository at this point in the history
…oss GUI, fixed padding in some notices.
  • Loading branch information
supereth committed Aug 15, 2016
1 parent 63883ed commit 88908bc
Show file tree
Hide file tree
Showing 2 changed files with 51 additions and 34 deletions.
78 changes: 48 additions & 30 deletions css/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -360,11 +360,29 @@ body {
border: none;
opacity: 1;
}

/* NEW ACCOUNT CONFIRMATION POPUP */

#login-wPop-new {
background: #ffffff;
color: #555555;
padding-bottom: 1rem;
}
#login-wPop-new p {
padding-left: 1rem;
padding-right: 1rem;
}

/* SEED WHITESPACE CONFIRMATION POPUP */

#seed-whitespace-popup {
max-width: 550px;
}
#seed-whitespace-popup p {
text-align: justify;
padding-left: 1rem;
padding-right: 1rem;
}
#register > form {
margin: 0 auto;
padding: 1rem;
Expand Down Expand Up @@ -931,13 +949,7 @@ input.tabs-radio:checked + label img {
max-width: 550px;
}
#login-wPop-new p {
text-align: left;
}
#seed-whitespace-popup {
max-width: 550px;
}
#seed-whitespace-popup p {
text-align: justify;
text-align: justify;
}
#addContactSubmit,
#close_create_account_modal {
Expand All @@ -962,6 +974,35 @@ input.tabs-radio:checked + label img {
background: #E1B47D;
}

/* Payment forms BUTTONS style */

.paymentForm-but {
border: 1px solid #37556E;
outline: none;
position: relative;
margin: 0 auto;
/* width: 5rem;*/
padding-left: .5rem;
padding-right: .5rem;
background: #fff;
font-family: 'Wesli';
font-size: 1rem;
color: #37556E;
text-align: center;
}
.paymentForm-but:hover {
cursor: pointer;
background: #37556E;
color: #fff;
}

/* Send Payment(s) form buttons */

.send-but {
padding: .3rem;
width: 4.5rem;
}

/* ======================================================================= */


Expand Down Expand Up @@ -1068,29 +1109,6 @@ input.tabs-radio:checked + label img {
text-align: right;
padding-right: .5rem;
}

/* Payment forms BUTTONS style */

.paymentForm-but {
border: 1px solid #37556E;
outline: none;
position: relative;
margin: 0 auto;
width: 5rem;
padding-left: .5rem;
padding-right: .5rem;
background: #fff;
font-family: 'Wesli';
font-size: 1rem;
line-height: 2.3rem;
color: #37556E;
text-align: center;
}
.paymentForm-but:hover {
cursor: pointer;
background: #37556E;
color: #fff;
}
.custom-combobox {
position: relative;
display: inline-block;
Expand Down
7 changes: 3 additions & 4 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ <h2>NEW ACCOUNT - NOTICE</h2>
The procedure consists of complex cryptographic operations that use a <b>SEED</b> (a series of random words) to create a unique address for your account.
<br/><br/>
This SEED is extremely important and must be kept in safe place, since it's the only way to recover your account in case of lost, corrupted data or hardware failure.
<br/><br/>
<br/>
Your SEED will also allow you to IMPORT your account to other devices.
<br/><br/>
<i>NOTE: Make sure that you select the entire SEED length before keeping it. It's suggested to use the copy-to-clipboard button located the right side of the SEED box.</i>
Expand All @@ -129,7 +129,6 @@ <h2>SEED NOTICE</h2>
It is strongly recommended to avoid trailing whitespaces in the seed. If you understand all the implications of having a seed with trailing whitespace(s) press <b>PROCEED</b>.
Press <b>CANCEL</b> or close the dialog to edit the seed.<br/>
</p>
<br/>
<div class="wPop-content-buttons">
<a id="close-seed-whitespace-modal" href="#" class="wButton paymentForm-but fade">PROCEED</a><span class="divider-2"></span>
<a href="#" rel="modal:close" class="wButton paymentForm-but fade">CLOSE</a>
Expand Down Expand Up @@ -232,7 +231,7 @@ <h2>SEED NOTICE</h2>
<img class="wPop-header" src="img/modal-header.svg" />
<div class="wPop-content">
<h2>ACCOUNT INFO BACKUP</h2>
<p>Your account's basic information, click the COPY button in order to copy the contents to the clipboard or CLOSE to exit.</p></br>
<p>Your account's basic information, click the <b>COPY</b> button in order to copy the contents to the clipboard or <b>CLOSE</b> to exit.</p></br>
<form id="backupForm">
<label for="seedBackup">Seed</label><br/>
<textarea id="seedBackup" class="wInput" rows="3" readonly></textarea><br/>
Expand Down Expand Up @@ -561,7 +560,7 @@ <h2>SEND PAYMENT</h2>

</form>
<!-- check -->
<div id="wavessend" class="paymentForm-but fade" value="send"><p>SUBMIT</p></div>
<div id="wavessend" class="paymentForm-but send-but fade" value="send"><p>SUBMIT</p></div>
<div id="sentpayment" style="width: 500px; word-wrap:break-word;"></div>
<div id="errorpayment" style="width: 500px; word-wrap:break-word;"></div>

Expand Down

0 comments on commit 88908bc

Please sign in to comment.