gekaufte Rosen Layout an Hintergrundfarben angepasst
This commit is contained in:
parent
3c5d7f9b37
commit
c237c8c1e5
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -1,2 +1,2 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<merger version="3"><dataSet config="main"><source path="C:\Ionic\Ionic\git2\wolle-rosen-kaufen\platforms\android\CordovaLib\assets"/></dataSet><dataSet config="debug"><source path="C:\Ionic\Ionic\git2\wolle-rosen-kaufen\platforms\android\CordovaLib\src\debug\assets"/></dataSet></merger>
|
<merger version="3"><dataSet config="main"><source path="C:\Projekte\wolle-rosen-kaufen\platforms\android\CordovaLib\assets"/></dataSet><dataSet config="debug"><source path="C:\Projekte\wolle-rosen-kaufen\platforms\android\CordovaLib\src\debug\assets"/></dataSet></merger>
|
||||||
@ -1,2 +1,2 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<merger version="3"><dataSet config="main"><source path="C:\Ionic\Ionic\git2\wolle-rosen-kaufen\platforms\android\CordovaLib\res"/><source path="C:\Ionic\Ionic\git2\wolle-rosen-kaufen\platforms\android\CordovaLib\build\generated\res\rs\debug"/><source path="C:\Ionic\Ionic\git2\wolle-rosen-kaufen\platforms\android\CordovaLib\build\generated\res\generated\debug"/></dataSet><dataSet config="debug"><source path="C:\Ionic\Ionic\git2\wolle-rosen-kaufen\platforms\android\CordovaLib\src\debug\res"/></dataSet><mergedItems/></merger>
|
<merger version="3"><dataSet config="main"><source path="C:\Projekte\wolle-rosen-kaufen\platforms\android\CordovaLib\res"/><source path="C:\Projekte\wolle-rosen-kaufen\platforms\android\CordovaLib\build\generated\res\rs\debug"/><source path="C:\Projekte\wolle-rosen-kaufen\platforms\android\CordovaLib\build\generated\res\generated\debug"/></dataSet><dataSet config="debug"><source path="C:\Projekte\wolle-rosen-kaufen\platforms\android\CordovaLib\src\debug\res"/></dataSet><mergedItems/></merger>
|
||||||
Binary file not shown.
@ -78,3 +78,7 @@
|
|||||||
font-size: 0.9em;
|
font-size: 0.9em;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.tab-item{
|
||||||
|
background-color: #A50505 !important;
|
||||||
|
}
|
||||||
@ -1,29 +1,6 @@
|
|||||||
<ion-view view-title="Gekaufte Rosen">
|
<ion-view view-title="Gekaufte Rosen">
|
||||||
<ion-content class="padding">
|
<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 style="padding-bottom:20px;"></div>
|
||||||
<div class="item item-divider oleo">Hier können Sie Ihre gekauften Rosen ansehen oder nochmals versenden!</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="list card">
|
||||||
<div class="item item-avatar"> <img src="img/rose1.png">
|
<div class="item item-avatar"> <img src="img/rose1.png">
|
||||||
<h2>{{i.name}}</h2>
|
<h2>{{i.name}}</h2>
|
||||||
>>>>>>> f003b2ed3c45bc52fbfd8b3ed0e00426040727c0
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="item item-body">
|
<div class="item item-body">
|
||||||
@ -42,13 +18,15 @@
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<ion-item>
|
<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>
|
<div class="item tabs tabs-secondary tabs-icon-left">
|
||||||
<a class="tab-item" data-ink-color="#A50505" data-ink-opacity="0.5"> <i class="icon ion-chatbox"></i> Comment </a>
|
<a href="#" class="tab-item"><i class="icon ion-trash-a button-custom"></i>Löschen</a>
|
||||||
<a class="tab-item" data-ink-color="#A50505" data-ink-opacity="0.5"> <i class="icon ion-share"></i> Teilen </a>
|
<a href="#" class="tab-item"><i class="icon ion-android-image button-custom"></i>Anzeigen</a>
|
||||||
</div>
|
<a href="#" class="tab-item"><i class="icon ion-share button-custom"></i>Teilen</a>
|
||||||
|
</div>
|
||||||
|
|
||||||
</ion-item>
|
</ion-item>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
</ion-card>
|
</ion-card>
|
||||||
|
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
* This file is auto-generated. DO NOT MODIFY.
|
* This file is auto-generated. DO NOT MODIFY.
|
||||||
* Original file: C:\\Ionic\\Ionic\\git2\\wolle-rosen-kaufen\\platforms\\android\\src\\com\\android\\vending\\billing\\IInAppBillingService.aidl
|
* Original file: C:\\Projekte\\wolle-rosen-kaufen\\platforms\\android\\src\\com\\android\\vending\\billing\\IInAppBillingService.aidl
|
||||||
*/
|
*/
|
||||||
package com.android.vending.billing;
|
package com.android.vending.billing;
|
||||||
/**
|
/**
|
||||||
|
|||||||
@ -78,3 +78,7 @@
|
|||||||
font-size: 0.9em;
|
font-size: 0.9em;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.tab-item{
|
||||||
|
background-color: #A50505 !important;
|
||||||
|
}
|
||||||
@ -1,29 +1,6 @@
|
|||||||
<ion-view view-title="Gekaufte Rosen">
|
<ion-view view-title="Gekaufte Rosen">
|
||||||
<ion-content class="padding">
|
<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 style="padding-bottom:20px;"></div>
|
||||||
<div class="item item-divider oleo">Hier können Sie Ihre gekauften Rosen ansehen oder nochmals versenden!</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="list card">
|
||||||
<div class="item item-avatar"> <img src="img/rose1.png">
|
<div class="item item-avatar"> <img src="img/rose1.png">
|
||||||
<h2>{{i.name}}</h2>
|
<h2>{{i.name}}</h2>
|
||||||
>>>>>>> f003b2ed3c45bc52fbfd8b3ed0e00426040727c0
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="item item-body">
|
<div class="item item-body">
|
||||||
@ -42,13 +18,15 @@
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<ion-item>
|
<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>
|
<div class="item tabs tabs-secondary tabs-icon-left">
|
||||||
<a class="tab-item" data-ink-color="#A50505" data-ink-opacity="0.5"> <i class="icon ion-chatbox"></i> Comment </a>
|
<a href="#" class="tab-item"><i class="icon ion-trash-a button-custom"></i>Löschen</a>
|
||||||
<a class="tab-item" data-ink-color="#A50505" data-ink-opacity="0.5"> <i class="icon ion-share"></i> Teilen </a>
|
<a href="#" class="tab-item"><i class="icon ion-android-image button-custom"></i>Anzeigen</a>
|
||||||
</div>
|
<a href="#" class="tab-item"><i class="icon ion-share button-custom"></i>Teilen</a>
|
||||||
|
</div>
|
||||||
|
|
||||||
</ion-item>
|
</ion-item>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
</ion-card>
|
</ion-card>
|
||||||
|
|
||||||
|
|||||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Some files were not shown because too many files have changed in this diff Show More
Loading…
x
Reference in New Issue
Block a user