BTCPrivate
/
copay
mirror of https://github.com/BTCPrivate/copay.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #2085 from bechi/bugs/ui-02 

Bugs/ui 02
This commit is contained in:
Matias Alejo Garcia 2014-12-10 09:58:16 -03:00
parent 4841c2dc05 93bb454b42
commit 0eea193bf2
3 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
css/src/main.css
View File

@ -533,6 +533,14 @@ a.button-setup.add-wallet:hover {
}
a.button-setup {
border-radius: 3px;
border: 1px solid #E4E8EC;
display: block;
padding: 0.5rem;
background: transparent;
}
.createProfile a.button-setup, .home a.button-setup {
border-radius: 3px;
border: 1px solid #3E5366;
display: block;
@ -540,7 +548,7 @@ a.button-setup {
background: transparent;
}
.button-setup a:hover {
.createProfile .button-setup a:hover, .home .button-setup a:hover {
background: #3C4E60;
}

14
views/more.html
View File

@ -7,23 +7,21 @@
<form name="settingsForm">
<div class="row">
<div class="large-6 medium-6 columns">
<fieldset>
<legend translate>Wallet Unit</legend>
<div class="panel">
<label translate>Wallet Unit</label>
<select class="form-control" ng-model="selectedUnit" ng-options="o.name for o in unitOpts" ng-change="save()">
</select>
</fieldset>
</div>
</div>
<div class="large-6 medium-6 columns">
<fieldset>
<legend translate>Alternative Currency</legend>
<div class="panel">
<label translate>Alternative Currency</label>
<select class="form-control" ng-model="selectedAlternative" ng-options="alternative.name for alternative in alternativeOpts" ng-change="save()">
</select>
</fieldset>
</div>
</div>
</div>
</form>
<div class="line-dashed-h m20b"></div>
<div class="m20b row">
<div class="large-12 columns">

8
views/send.html
View File

@ -144,15 +144,15 @@
<div class="row">
<div class="large-6 medium-6 small-6 columns text-left">
<a class="button tiny secondary m0" title="Address book" ng-hide="_merchantData || lockAddress" ng-click="openAddressBook()">
<i class="fi-address-book"></i> Address book
<a class="button tiny secondary m0 radius" title="Address book" ng-hide="_merchantData || lockAddress" ng-click="openAddressBook()">
<i class="fi-address-book size-14 m5r vm"></i> Address book
</a>
<a ng-click="resetForm()" class="button warning m0" ng-show="_merchantData || lockAddress" ng-disabled="loading">
Cancel
</a>
</div>
<div class="large-6 medium-6 small-6 columns text-right">
<button type="submit" class="button primary m0" ng-disabled="sendForm.$invalid || loading">
<div class="large-4 medium-4 small-6 columns text-right">
<button type="submit" class="button primary m0 expand" ng-disabled="sendForm.$invalid || loading">
<i class="fi-bitcoin-circle icon-rotate spinner" ng-show="loading"></i> Send
</button>
</div>