Skip to content

Commit

Permalink
UI touch-ups
Browse files Browse the repository at this point in the history
  • Loading branch information
@chill117
chill117 committed May 22, 2019
1 parent 2ae5e9f commit fa45256
Show file tree
Hide file tree
Showing 15 changed files with 99 additions and 114 deletions.
2 changes: 1 addition & 1 deletion css/amount.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
display: inline-block;
}
.amount.crypto .amount-value {
font-weight: 200
font-weight: 200;
}
.amount.crypto .amount-currency {
font-weight: 500;
Expand Down
2 changes: 1 addition & 1 deletion css/header.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ html.screen-saver-on #header {
top: 0;
display: block;
line-height: 4.1rem;
font-weight: 200
font-weight: 200;
padding: 0 1rem;
}
.header-button {
Expand Down
2 changes: 1 addition & 1 deletion css/page.css
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
.page h1 {
font-size: 1.8rem;
font-weight: 200
font-weight: 200;
margin-bottom: 1rem;
}
.page h2 {
Expand Down
16 changes: 9 additions & 7 deletions css/payment-method.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,19 @@
width: 4.8rem;
height: 4.8rem;
background-size: 4.8rem;
background-position: center center;
background-position: center;
background-repeat: no-repeat;
box-sizing: border-box;
padding: 0;
margin: 0;
}
.payment-method.bitcoin,
.payment-method.bitcoinTestnet,
.payment-method.bitcoinLightning {
.payment-method.bitcoinTestnet {
background-image: url('../images/bitcoin.svg');
}
.payment-method.bitcoinLightning {
background-image: url('../images/bitcoin-lightning.svg');
}
.payment-method.litecoin,
.payment-method.litecoinTestnet {
background-image: url('../images/litecoin.svg');
Expand All @@ -34,13 +36,13 @@
.payment-method.bitcoinLightning:after {
position: absolute;
right: -.7rem;
bottom: -.7rem;
bottom: -.2rem;
z-index: 20;
content: ' ';
display: block;
width: 3rem;
height: 3rem;
background-size: 3rem;
width: 2.5rem;
height: 4.25rem;
background-size: 2.5rem 4.25rem;
background-color: transparent;
background-position: center center;
background-repeat: no-repeat;
Expand Down
2 changes: 1 addition & 1 deletion css/result-indicator.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
.result-indicator-inner {
color: #fff;
font-size: 2.2rem;
font-weight: 200
font-weight: 200;
text-align: center;
}
@-webkit-keyframes resultIndicatorScale {
Expand Down
21 changes: 11 additions & 10 deletions css/views/admin.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,19 +17,20 @@

/* General Settings */
.view.admin .form-group.configurableCryptoCurrencies .button.payment-method {
width: 3.2rem;
height: 3.2rem;
background-size: 3.2rem;
opacity: 0.5;
width: 5rem;
height: 5rem;
background-size: 4.5rem;
opacity: .33;
box-sizing: border-box;
padding: 0;
margin: 0 .4rem .4rem 0;
padding: .5rem;
}
.view.admin .form-group.configurableCryptoCurrencies .button.payment-method.bitcoinLightning:after {
right: -.4rem;
bottom: -.4rem;
width: 2.4rem;
height: 2.4rem;
background-size: 2.4rem;
right: -.5rem;
bottom: -.15rem;
width: 1.7rem;
height: 2.89rem;
background-size: 2rem 2.89rem;
}
.view.admin .form-group.configurableCryptoCurrencies input[type="checkbox"] {
position: absolute;
Expand Down
2 changes: 1 addition & 1 deletion css/views/choose-payment-method.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
.view.choose-payment-method .payment-method {
width: 6rem;
height: 6rem;
background-size: 5.4rem;
background-size: 6rem;
}
.view.choose-payment-method .button.secondary-control {
background-position: center center;
Expand Down
2 changes: 1 addition & 1 deletion css/views/enter-pin.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
}
.enter-pin-keys:empty:after {
content: '-';
font-weight: 200
font-weight: 200;
}
.enter-pin-inner {
margin: 0 auto;
Expand Down
4 changes: 2 additions & 2 deletions css/views/payment-details.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,14 @@
.view.payment-detail .payment-details-info-item-value-timestamp,
.view.payment-detail .payment-details-amount-crypto {
font-size: .9rem;
font-weight: 200
font-weight: 200;
margin-top: .2rem;
}
.view.payment-detail .payment-details-info-item-value.status {
display: inline-block;
vertical-align: top;
font-size: 1.1rem;
font-weight: 200
font-weight: 200;
background-color: rgba(210, 210, 210, 0.5);
border-radius: .5rem;
padding: .5rem 1rem;
Expand Down
2 changes: 1 addition & 1 deletion css/views/payment-history.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
.view.admin .payment-history-item-timestamp,
.view.admin .payment-history-item-amount-crypto {
font-size: 0.9rem;
font-weight: 200
font-weight: 200;
margin-top: .2rem;
}
.view.admin .payment-history-status-and-timestamp {
Expand Down
17 changes: 9 additions & 8 deletions css/views/recommended-mobile-wallets.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,10 @@
margin-top: .4rem;
}
.view.recommended-mobile-wallets .recommendations-group-item-payment-methods .payment-method {
width: 1.8rem;
height: 1.8rem;
background-size: 1.8rem;
width: 2.4rem;
height: 2.4rem;
background-size: 2.4rem;
background-position: 0;
}
.view.recommended-mobile-wallets .recommendations-group-item-payment-methods .payment-method.bitcoinTestnet {
font-size: .6rem;
Expand All @@ -37,9 +38,9 @@
left: -.15rem;
}
.view.recommended-mobile-wallets .recommendations-group-item-payment-methods .payment-method.bitcoinLightning:after {
right: -.3rem;
bottom: -.3rem;
width: 1.2rem;
height: 1.2rem;
background-size: 1.2rem;
right: -.5rem;
bottom: -.4rem;
width: 1rem;
height: 1.7rem;
background-size: 1rem 1.7rem;
}
24 changes: 13 additions & 11 deletions html/templates/admin-general-settings.html
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,19 @@
<form>
<div class="form">
<div class="form-group settings">
{{#each inputs}}
{{> formFieldRow .}}
{{/each}}
</div>
<div class="form-group configurableCryptoCurrencies">
<div class="form-group-label">{{i18n "settings.accept-crypto-currencies.label"}}</div>
{{#each paymentMethods}}
<input id="settings-configurableCryptoCurrencies-{{key}}" type="checkbox" name="configurableCryptoCurrencies[]" value="{{key}}"{{#if accepted}} checked{{/if}}>
<label for="settings-configurableCryptoCurrencies-{{key}}" class="button payment-method {{key}}" title="{{label}}" data-key="{{key}}"></label>
{{/each}}
<div class="clearfix"></div>
</div>
<div class="form-group other">
<div class="form-row">
<div class="form-label">{{i18n "admin.pin.label"}}</div>
<div class="form-field">
Expand All @@ -15,17 +28,6 @@
</div>
</div>
</div>
{{#each inputs}}
{{> formFieldRow .}}
{{/each}}
</div>
<div class="form-group configurableCryptoCurrencies">
<div class="form-group-label">{{i18n "settings.accept-crypto-currencies.label"}}</div>
{{#each paymentMethods}}
<input id="settings-configurableCryptoCurrencies-{{key}}" type="checkbox" name="configurableCryptoCurrencies[]" value="{{key}}"{{#if accepted}} checked{{/if}}>
<label for="settings-configurableCryptoCurrencies-{{key}}" class="button payment-method {{key}}" title="{{label}}" data-key="{{key}}"></label>
{{/each}}
<div class="clearfix"></div>
</div>
</div>
</form>
29 changes: 29 additions & 0 deletions images/bitcoin-lightning.svg
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
22 changes: 1 addition & 21 deletions images/bitcoin.svg
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
66 changes: 18 additions & 48 deletions images/lightning.svg
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit fa45256

Please sign in to comment.