Merge pull request #4 from cmgustavo/feature/foundation

From Bootstrap to Foundation
This commit is contained in:
Ryan X. Charles 2014-03-27 14:04:04 -04:00
commit b4bd9aafb0
6 changed files with 30 additions and 5837 deletions

View file

@ -7,7 +7,7 @@
],
"dependencies": {
"angular": "~1.2.x",
"angular-bootstrap": "~0.10.0",
"angular-foundation": "*",
"angular-route": "~1.2.14",
"angular-qrcode": "~3.1.0",
"peerjs": "~0.3.8",

5785
css/bootstrap.css vendored

File diff suppressed because it is too large Load diff

File diff suppressed because one or more lines are too long

1
css/foundation.min.css vendored Normal file

File diff suppressed because one or more lines are too long

View file

@ -5,22 +5,22 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="viewport" content="width=device-width">
<title>cosign - Multisignature Wallet</title>
<link rel="stylesheet" href="css/bootstrap.min.css">
<link rel="stylesheet" href="css/foundation.min.css">
<link rel="stylesheet" href="css/main.css">
</head>
<body>
<div class="container">
<div class="header" data-ng-init="init()" data-ng-controller="HeaderController">
<div class="page-header">
<h1>cosign</h1>
</div>
<ul class="nav nav-pills">
<li data-ng-repeat="item in menu" ui-route="/{{item.link}}" data-ng-class="{active: isActive(item)}">
<div class="row">
<div class="large-12 columns" data-ng-init="init()" data-ng-controller="HeaderController">
<h1>cosign</h1>
<dl class="sub-nav">
<dd data-ng-repeat="item in menu" ui-route="/{{item.link}}" data-ng-class="{active: isActive(item)}">
<a href="{{item.link}}">{{item.title}}</a>
</li>
</ul>
</dd>
</dl>
</div>
<div ng-view></div>
</div>
<div class="row">
<div class="large-12 columns" ng-view></div>
</div>
<!-- Templates -->
@ -54,7 +54,7 @@
<div class="transactions" data-ng-controller="TransactionsController">
<h2>{{title}}</h2>
<div class="row">
<div class="col-xs-6">
<div class="large-6 columns">
<h3>Input</h3>
<accordion close-others="oneAtATime">
<accordion-group ng-repeat="tx in txsinput">
@ -69,7 +69,7 @@
</accordion-group>
</accordion>
</div>
<div class="col-xs-6">
<div class="large-6 columns">
<h3>Output</h3>
<accordion close-others="oneAtATime">
<accordion-group ng-repeat="tx in txsoutput">
@ -87,34 +87,18 @@
<script type="text/ng-template" id="send.html">
<div class="send" data-ng-controller="SendController">
<h2>{{title}}</h2>
<form class="form-horizontal" role="form">
<div class="form-group">
<label for="address" class="col-sm-2 control-label">To:</label>
<div class="col-sm-10">
<input type="text" class="form-control" id="address" placeholder="Send to">
</div>
</div>
<div class="form-group">
<label for="amount" class="col-sm-2 control-label">Amount:</label>
<div class="col-sm-10">
<div class="row">
<div class="col-xs-6">
<input type="text" class="form-control" id="amount" placeholder="Amount">
</div>
<div class="col-xs-6">
<select class="form-control">
<option>mBTC</option>
<option>BTC</option>
</select>
</div>
</div>
</div>
</div>
<div class="form-group">
<div class="col-sm-offset-2 col-sm-10">
<button type="submit" class="btn btn-default">send</button>
</div>
</div>
<form>
<label for="address">To
<input type="text" id="address" placeholder="Send to">
</label>
<label for="amount">Amount
<input type="text" id="amount" placeholder="Amount">
<select class="form-control">
<option>mBTC</option>
<option>BTC</option>
</select>
</label>
<button type="submit" class="btn btn-default">send</button>
</form>
</div>
</script>
@ -142,8 +126,8 @@
<script src="lib/qrcode-generator/js/qrcode.js"></script>
<script src="lib/angular-qrcode/qrcode.js"></script>
<script src="lib/angular-route/angular-route.min.js"></script>
<script src="lib/angular-bootstrap/ui-bootstrap.min.js"></script>
<script src="lib/angular-bootstrap/ui-bootstrap-tpls.min.js"></script>
<script src="lib/angular-foundation/mm-foundation.min.js"></script>
<script src="lib/angular-foundation/mm-foundation-tpls.min.js"></script>
<script src="lib/peerjs/peer.js"></script>
<script src="js/app.js"></script>
<script src="js/config.js"></script>

View file

@ -2,7 +2,7 @@
angular.module('cosign',[
'ngRoute',
'ui.bootstrap',
'mm.foundation',
'cosign.header',
'cosign.home',
'cosign.transactions',