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

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

platforms/android/build/intermediates/assets/debug/www/css/style.css

@@ -65,3 +65,16 @@
  	font-size: 1.3em !important;
 }
 
+.oleo-small{
+	font-family: 'Bubblegum Sans', cursive;
+	font-weight: 200 !important;
+ 	font-size: 1.2em;
+	
+}
+
+.oleo-vsmall{
+	font-family: 'Bubblegum Sans', cursive;
+	font-weight: 200 !important;
+ 	font-size: 0.9em;
+	
+}

platforms/android/build/intermediates/assets/debug/www/templates/tab-buys - Kopie.html

@@ -0,0 +1,29 @@
+<ion-view view-title="Gekaufte Rosen">
+ <ion-content class="padding">
+
+       <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 src="img/rose1.png">
+			<h2>{{i.name}}</h2>
+			<p>{{i.freitext}} </p>
+                <div class="buttons" style="margin-top:30px;">
+                    <button class="button button-small" >
+                     <i class="button button-icon icon ion-settings"></i>
+                    </button>
+                    <button class="button button-small">
+                        <i class="icon ion-android-share-alt"> Teilen</i>
+                    </button>
+                </div>
+					
+			</a>
+
+			</ul>			
+		</div>
+		
+
+  </ion-content>
+</ion-view>

platforms/android/build/intermediates/assets/debug/www/templates/tab-buys.html

@@ -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>

platforms/android/build/intermediates/assets/debug/www/templates/tab-dash.html

@@ -3,20 +3,20 @@
     <div class="list card">
         <div class="item item-divider oleo">Schenken Sie einem besonderen Menschen eine außergewöhnliche Aufmerksamkeit!</div>
           <label class="item item-input item-stacked-label">
-            <span class="input-label">Name Ihres Liebsten:</span>
-            <input type="text" placeholder="" class="oleo" ng-model="$parent.name">
+            <span class="oleo-small" class="input-label">Name Ihres Liebsten:</span>
+            <textarea  placeholder="" rows="1" cols="1" class="oleo-small" ng-model="$parent.name"></textarea>
           </label>
           <label class="item item-input item-stacked-label">
-            <span class="input-label">Ihre persönliche Nachricht:</span>
-            <textarea placeholder="" rows="4" cols="10" class="oleo" ng-model="$parent.freitext"></textarea>
+            <span class="oleo-small" class="input-label">Ihre persönliche Nachricht:</span>
+            <textarea placeholder="" rows="4" cols="10" class="oleo-small" ng-model="$parent.freitext"></textarea>
           </label>
         </div>
         <div style="padding-bottom:15px;">
           <div class="item item-divider oleo">Wählen Sie Ihre Rosen aus:</div>
           <ion-list>
-            <ion-radio ng-model="$parent.preis" ng-value="'1xrose'" class="item item-thumbnail-left item-text-wrap"><img src="img/rose1.png"><h2 class="oleo">1 Rose </h2><p>Preis: 0,50 € (zzgl. gesetzl. MwSt.)</p></ion-radio>
-            <ion-radio ng-model="$parent.preis" ng-value="'3xrose'" class="item item-thumbnail-left item-text-wrap"><img src="img/rose3.png"><h2 class="oleo">3 Rosen</h2><p>Preis: 1,00 € (zzgl. gesetzl. MwSt.)</p></ion-radio>
-            <ion-radio ng-model="$parent.preis" ng-value="'9xrose'" class="item item-thumbnail-left item-text-wrap"><img src="img/rose10.png"><h2 class="oleo">9 Rosen</h2><p>Preis: 2,00 € (zzgl. gesetzl. MwSt.)</p></ion-radio>
+            <ion-radio ng-model="$parent.preis" ng-value="'1xrose'" class="item item-thumbnail-left item-text-wrap"><img src="img/rose1.png"><h2 class="oleo">1 Rose </h2> <span class="oleo-vsmall"<p>Preis: 0,50 € (zzgl. gesetzl. MwSt.)</p></span> </ion-radio>
+            <ion-radio ng-model="$parent.preis" ng-value="'3xrose'" class="item item-thumbnail-left item-text-wrap"><img src="img/rose3.png"><h2 class="oleo">3 Rosen</h2> <span class="oleo-vsmall"<p>Preis: 1,00 € (zzgl. gesetzl. MwSt.)</p></span> </ion-radio>
+            <ion-radio ng-model="$parent.preis" ng-value="'9xrose'" class="item item-thumbnail-left item-text-wrap"><img src="img/rose10.png"><h2 class="oleo">9 Rosen</h2> <span class="oleo-vsmall"<p>Preis: 2,00 € (zzgl. gesetzl. MwSt.)</p></span> </ion-radio>
           </ion-list>
          </div>