2016-09-29 05:10:58 +00:00
|
|
|
<!doctype html>
|
|
|
|
|
<html>
|
2016-10-05 05:55:53 +00:00
|
|
|
|
|
|
|
|
<head>
|
|
|
|
|
<title>Salix</title>
|
2016-10-05 13:13:28 +00:00
|
|
|
<link rel="stylesheet" href="https://fonts.googleapis.com/icon?family=Material+Icons">
|
|
|
|
|
<link rel="stylesheet" href="https://code.getmdl.io/1.2.1/material.indigo-pink.min.css">
|
|
|
|
|
|
2016-10-05 05:55:53 +00:00
|
|
|
</head>
|
|
|
|
|
<body>
|
|
|
|
|
<div id="app">
|
|
|
|
|
{{1+1}}
|
2016-10-05 13:20:59 +00:00
|
|
|
<<<<<<< HEAD
|
2016-10-05 13:19:28 +00:00
|
|
|
<div ui-view></div>
|
|
|
|
|
<a ui-sref="index">index</a>
|
|
|
|
|
<a ui-sref="add">add</a>
|
|
|
|
|
<a ui-sref="edit">edit</a>
|
|
|
|
|
<a ui-sref="delete">delete</a>
|
2016-10-05 13:20:59 +00:00
|
|
|
=======
|
2016-10-05 13:13:28 +00:00
|
|
|
<vn-button text="texto del boton"></vn-button><br>
|
|
|
|
|
<vn-check text="texto del text" ></vn-check><br>
|
|
|
|
|
<vn-radio text="texto del radio"></vn-radio><br>
|
|
|
|
|
<vn-textfield text="prueba" type="email"></vn-textfield><br>
|
|
|
|
|
<vn-txt text="hola mundo"></vn-txt>
|
2016-10-05 13:20:59 +00:00
|
|
|
>>>>>>> f1a3e2dd5837c6b7a66486b5566e422ca10a8399
|
2016-09-29 09:04:11 +00:00
|
|
|
</div>
|
2016-10-05 05:55:53 +00:00
|
|
|
<script type="text/javascript" src="build/salix.app.js" selector="#app"></script>
|
2016-10-05 13:13:28 +00:00
|
|
|
<script defer src="https://code.getmdl.io/1.2.1/material.min.js"></script>
|
2016-10-05 05:55:53 +00:00
|
|
|
</body>
|
2016-10-05 06:03:43 +00:00
|
|
|
</html>
|
