Raataar/Wolle-Rosen-Kaufen
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

merg complete

Browse Source
This commit is contained in:
Carsten Hilmer
2016-01-22 00:53:11 +01:00
parent 81c4347cf1
commit 3c5d7f9b37
193 changed files with 40 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
www/templates/tab-buys.html
View File

@@ -1,29 +1,6 @@
<ion-view view-title="Gekaufte Rosen">
<ion-content class="padding">
<<<<<<< HEAD
<div style="padding-bottom:15px;">
<ul class="list card">
<div class="item item-divider oleo">Hier können Sie Ihre gekauften Rosen ansehen oder nochmals versenden!</div>
<a class="item item-thumbnail-left item-button-right" href="#" ng-repeat="i in items" ng-model="items">
<img ng-src="{{i.bild}}>
<h1>{{i.name}}</h1>
<p>{{i.freitext}} </p>
<div class="buttons" style="margin-top:30px;">
<button class="button button-small" >
<i class="icon ion-image"> Vorschau</i>
</button>
<button class="button button-small">
<i class="icon ion-android-share-alt"> Teilen</i>
</button>
</div>
</a>
</ul>
=======
<div style="padding-bottom:20px;"></div>
<div class="item item-divider oleo">Hier können Sie Ihre gekauften Rosen ansehen oder nochmals versenden!</div>
@@ -34,7 +11,6 @@
<div class="list card">
<div class="item item-avatar"> <img src="img/rose1.png">
<h2>{{i.name}}</h2>
>>>>>>> f003b2ed3c45bc52fbfd8b3ed0e00426040727c0
</div>
<div class="item item-body">