unknown
81c4347cf1
Conflicts: platforms/android/.gradle/2.2.1/taskArtifacts/cache.properties.lock platforms/android/.gradle/2.2.1/taskArtifacts/fileHashes.bin platforms/android/.gradle/2.2.1/taskArtifacts/fileSnapshots.bin platforms/android/.gradle/2.2.1/taskArtifacts/outputFileStates.bin platforms/android/.gradle/2.2.1/taskArtifacts/taskArtifacts.bin platforms/android/.idea/workspace.xml platforms/android/assets/www/templates/tab-buys.html platforms/android/build/intermediates/assets/debug/www/templates/tab-buys.html platforms/android/build/intermediates/gradle_project_sync_data.bin platforms/android/build/intermediates/res/resources-debug.ap_ platforms/android/build/outputs/apk/android-debug-unaligned.apk platforms/android/build/outputs/apk/android-debug.apk platforms/android/local.properties www/templates/tab-buys.html
57 lines
1.8 KiB
HTML
57 lines
1.8 KiB
HTML
<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>
|
|
|
|
<a href="#" ></a>
|
|
|
|
<ion-card ng-repeat="i in items" ng-model="items">
|
|
|
|
<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">
|
|
{{i.freitext}}
|
|
</div>
|
|
|
|
<ion-item>
|
|
<div class="item tabs tabs-secondary tabs-icon-left">
|
|
<a class="tab-item" background-color="#A50505" data-ink-opacity="0.5"> <i class="icon ion-thumbsup"></i> Like </a>
|
|
<a class="tab-item" data-ink-color="#A50505" data-ink-opacity="0.5"> <i class="icon ion-chatbox"></i> Comment </a>
|
|
<a class="tab-item" data-ink-color="#A50505" data-ink-opacity="0.5"> <i class="icon ion-share"></i> Teilen </a>
|
|
</div>
|
|
</ion-item>
|
|
</div>
|
|
|
|
</ion-card>
|
|
|
|
</ion-content>
|
|
</ion-view>
|