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

Merge branch 'master' of 192.168.178.250:raataar/wolle-rosen-kaufen

Browse Source 
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
This commit is contained in:
Carsten Hilmer
2016-01-22 00:39:00 +01:00
parent d22c3ce5b1 f003b2ed3c
commit 81c4347cf1
211 changed files with 521 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,6 +1,7 @@
<ion-view view-title="Gekaufte Rosen">
<ion-content class="padding">
<ion-content class="padding">
<<<<<<< HEAD
<div style="padding-bottom:15px;">
<ul class="list card">
@@ -22,8 +23,34 @@
</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-content>
</ion-view>