Skip to content

Commit

Permalink
back in lobby
Browse files Browse the repository at this point in the history
  • Loading branch information
tilthz committed Apr 9, 2014
1 parent 7d8017a commit 7c1a61d
Show file tree
Hide file tree
Showing 5 changed files with 45 additions and 65 deletions.
3 changes: 3 additions & 0 deletions css/app.css
Original file line number Diff line number Diff line change
Expand Up @@ -5480,6 +5480,9 @@ div.scroller.ng-leave {
.setback.notifications {
background: url(../images/notifications.svg) right/contain no-repeat; }

.lobbyback {
background: url(../images/virtual.svg) top/cover no-repeat; }

.setback > * {
opacity: 0.8; }

Expand Down
2 changes: 1 addition & 1 deletion html/partials/lobby.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<section>
<div class="container">
<div class="container lobbyback">
<div class="row">
<!-- Channel list -->
<div class="large-2 columns panel">
Expand Down
6 changes: 3 additions & 3 deletions html/partials/send.html
Original file line number Diff line number Diff line change
Expand Up @@ -20,20 +20,20 @@ <h6>Sending from</h6>
</div>

<div class="row" ng-repeat="field in recipients.fields">
<div class="medium-8 columns">
<div class="medium-8 large-9 columns">

<input type="text" class="prefix radius" ng-model="field.address" ng-change="autoAddField()" placeholder="Enter a bitcoin address here or use the buttons on the right." />
<a href="" tooltip="Scan QR code" ng-click="openModal('scan-qr', {field: field}, onQrModalOkSend, onQrModalCancel)" class="fa button square righted fa-qrcode"></a>
<a href="" tooltip="Select from contacts" ng-click="openModal('pick-contact', {contacts: identity.contacts.contacts, field: field}, addAddress)" class="fa button square righted fa-users"></a>

</div>
<div class="medium-4 columns">
<div class="medium-4 large-3 columns">
<div class="row collapse">
<div class="small-8 columns">
<input ng-hide="field.isFiatShown" type="text" class="prefix radius" ng-model="field.amount" ng-change="updateBtcFiat(field); autoAddField()" placeholder="Enter amount" />
<input ng-show="field.isFiatShown" type="text" class="prefix radius" ng-model="field.fiatAmount" ng-change="updateBtcFiat(field); autoAddField()" placeholder="Enter amount" />
</div>
<div class="small-4 columns"><span class="postfix radius" btn-checkbox ng-model="field.isFiatShown">{{field.isFiatShown? selectedFiat : selectedCurrency}}</span></div>
<div class="small-4 columns"><a class="button postfix radius" btn-checkbox tooltip="click to switch to {{selectedFiat}}" ng-model="field.isFiatShown">{{field.isFiatShown? selectedFiat : selectedCurrency}}</a></div>
</div>
</div>
</div>
Expand Down
98 changes: 37 additions & 61 deletions images/virtual.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions sass/app.scss
Original file line number Diff line number Diff line change
Expand Up @@ -221,6 +221,7 @@ div.scroller.ng-leave.ng-leave-active {

.setback.notifications { background: url(../images/notifications.svg) right/contain no-repeat; }

.lobbyback { background: url(../images/virtual.svg) top/cover no-repeat; }

.setback > * { opacity: 0.8; }

Expand Down

0 comments on commit 7c1a61d

Please sign in to comment.