Merge pull request #1799 from marianorod/table_redesign

Table redesign
This commit is contained in:
Gustavo Maximiliano Cortez 2014-11-15 00:06:18 -03:00
commit b9d66b3a12
3 changed files with 51 additions and 34 deletions

View file

@ -836,6 +836,20 @@ label small.has-error {
font-size: 11px; font-size: 11px;
} }
table { border-collapse: collapse; text-align: left; width: 100%; border: none;
box-shadow: -2px 1px 9px 1px #DDDDDD;
-webkit-box-shadow: -2px 1px 5px 1px #DDDDDD;
-moz-box-shadow: -2px 1px 5px 1px #DDDDDD;
-o-box-shadow: -2px 1px 5px 1px #DDDDDD;
}
thead tr{ text-transform: uppercase; border-top: 1px solid #FFFFFF; height: 46px}
table td, table th { padding: 15px 15px; height: 58px} }
table thead th {background-color: #F5F5F8; color:#949BAD; font-size: 13px; font-weight: normal; !important}
table tbody td { color: #000000; font-size: 14px;border-bottom: 1px solid #F1F1F3; }
table tbody tr:last-child td { border-bottom: none; }
table tr.active { table tr.active {
background: #CBECE6; background: #CBECE6;
} }

File diff suppressed because one or more lines are too long

Before

Width:  |  Height:  |  Size: 19 KiB

After

Width:  |  Height:  |  Size: 19 KiB

Before After
Before After

View file

@ -42,7 +42,9 @@
<div class="row" ng-init="getWallets()"> <div class="row" ng-init="getWallets()">
<div class="large-12 columns"> <div class="large-12 columns">
<h2>Manage wallets</h2> <h2>Manage wallets</h2>
<table width="100%" role="grid">
<table>
<thead> <thead>
<tr> <tr>
<th>Name</th> <th>Name</th>
@ -59,15 +61,15 @@
networkName = item.getNetworkName()" networkName = item.getNetworkName()"
ng-class="{'deleting':loading==item.id}"> ng-class="{'deleting':loading==item.id}">
<td>{{item.name || item.id }}</td> <td>{{item.name || item.id }}</td>
<td width="120">{{item.requiredCopayers}} of {{item.totalCopayers}} - {{networkName}}</td> <td>{{item.requiredCopayers}} of {{item.totalCopayers}} - {{networkName}}</td>
<td width="200">{{isReady ? 'Complete' : 'Waiting for copayers...'}}</td> <td>{{isReady ? 'Complete' : 'Waiting for copayers...'}}</td>
<td width="200"> <td>
<span ng-if="!isReady">-</span> <span ng-if="!isReady">-</span>
<span ng-if="isReady"> <span ng-if="isReady">
{{item.balanceInfo.totalBalance || 0 |noFractionNumber}} {{item.settings.unitName}} {{item.balanceInfo.totalBalance || 0 |noFractionNumber}} {{item.settings.unitName}}
</span> </span>
</td> </td>
<td width="90" class="text-center"> <td class="text-center">
<div ng-show="loading != item.id"> <div ng-show="loading != item.id">
<a title="Download Backup" class="text-gray" ng-click="downloadWalletBackup(item)" <a title="Download Backup" class="text-gray" ng-click="downloadWalletBackup(item)"
@ -84,6 +86,7 @@
</tr> </tr>
</tbody> </tbody>
</table> </table>
</div> </div>
</div> </div>
</div> </div>