verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 64 Releases Wiki Activity

merge bien hecho

This commit is contained in:
nelo 2016-10-05 15:22:10 +02:00
parent 00c8fb455f
commit 5c9f7fd04e
1 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
index.html
View File

@ -10,19 +10,16 @@
<body> <body>
<div id="app"> <div id="app">
{{1+1}} {{1+1}}
<<<<<<< HEAD
<div ui-view></div> <div ui-view></div>
<a ui-sref="index">index</a> <a ui-sref="index">index</a>
<a ui-sref="add">add</a> <a ui-sref="add">add</a>
<a ui-sref="edit">edit</a> <a ui-sref="edit">edit</a>
<a ui-sref="delete">delete</a> <a ui-sref="delete">delete</a>
=======
<vn-button text="texto del boton"></vn-button><br> <vn-button text="texto del boton"></vn-button><br>
<vn-check text="texto del text" ></vn-check><br> <vn-check text="texto del text" ></vn-check><br>
<vn-radio text="texto del radio"></vn-radio><br> <vn-radio text="texto del radio"></vn-radio><br>
<vn-textfield text="prueba" type="email"></vn-textfield><br> <vn-textfield text="prueba" type="email"></vn-textfield><br>
<vn-txt text="hola mundo"></vn-txt> <vn-txt text="hola mundo"></vn-txt>
>>>>>>> f1a3e2dd5837c6b7a66486b5566e422ca10a8399
</div> </div>
<script type="text/javascript" src="build/salix.app.js" selector="#app"></script> <script type="text/javascript" src="build/salix.app.js" selector="#app"></script>
<script defer src="https://code.getmdl.io/1.2.1/material.min.js"></script> <script defer src="https://code.getmdl.io/1.2.1/material.min.js"></script>