Styles angepasst

This commit is contained in:
Carsten Hilmer 2016-02-04 21:53:35 +01:00
parent 31bafd271f
commit 28234a29b2
25 changed files with 98 additions and 90 deletions

View File

@ -1,5 +1,32 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="EntryPointsManager">
<entry_points version="2.0" />
</component>
<component name="NullableNotNullManager">
<option name="myDefaultNullable" value="android.support.annotation.Nullable" />
<option name="myDefaultNotNull" value="android.support.annotation.NonNull" />
<option name="myNullables">
<value>
<list size="4">
<item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.Nullable" />
<item index="1" class="java.lang.String" itemvalue="javax.annotation.Nullable" />
<item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.Nullable" />
<item index="3" class="java.lang.String" itemvalue="android.support.annotation.Nullable" />
</list>
</value>
</option>
<option name="myNotNulls">
<value>
<list size="4">
<item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.NotNull" />
<item index="1" class="java.lang.String" itemvalue="javax.annotation.Nonnull" />
<item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.NonNull" />
<item index="3" class="java.lang.String" itemvalue="android.support.annotation.NonNull" />
</list>
</value>
</option>
</component>
<component name="ProjectLevelVcsManager" settingsEditedManually="false">
<OptionsSetting value="true" id="Add" />
<OptionsSetting value="true" id="Remove" />

View File

@ -42,11 +42,9 @@
<file leaf-file-name="InAppBrowser.java" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/org/apache/cordova/inappbrowser/InAppBrowser.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding>
<element signature="e#0#38645#0" expanded="true" />
</folding>
<state vertical-scroll-proportion="0.3887195">
<caret line="15" column="62" selection-start-line="15" selection-start-column="62" selection-end-line="15" selection-end-column="62" />
<folding />
</state>
</provider>
</entry>
@ -56,6 +54,7 @@
<component name="GenerateSignedApkSettings">
<option name="KEY_STORE_PATH" value="D:\_PROJEKTE_\Android_NAS\android-playstore-stuff\KeyStoreAPK\raataar.jks" />
<option name="KEY_ALIAS" value="wollerosenkaufen" />
<option name="REMEMBER_PASSWORDS" value="true" />
</component>
<component name="GradleLocalSettings">
<option name="availableProjects">
@ -1232,7 +1231,7 @@
</option>
<option name="modificationStamps">
<map>
<entry key="C:\Ionic\Ionic\git2\wolle-rosen-kaufen\platforms\android" value="5818462159766" />
<entry key="C:\Ionic\Ionic\git2\wolle-rosen-kaufen\platforms\android" value="5818468093647" />
</map>
</option>
<option name="projectBuildClasspath">
@ -1646,30 +1645,6 @@
<option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidBuildScriptsGroupNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="android" />
<option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="android" />
<option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidModuleNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="android" />
<option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="android" />
<option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidModuleNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="manifests" />
<option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidManifestsGroupNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="android" />
@ -1848,7 +1823,7 @@
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1936" height="1176" extended-state="6" />
<editor active="false" />
<editor active="true" />
<layout>
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
<window_info id="Messages" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.32941177" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
@ -1896,11 +1871,9 @@
</entry>
<entry file="file://$PROJECT_DIR$/src/org/apache/cordova/inappbrowser/InAppBrowser.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding>
<element signature="e#0#38645#0" expanded="true" />
</folding>
<state vertical-scroll-proportion="0.3887195">
<caret line="15" column="62" selection-start-line="15" selection-start-column="62" selection-end-line="15" selection-end-column="62" />
<folding />
</state>
</provider>
</entry>

View File

@ -43,6 +43,7 @@
}
.bar-custom{
background-color: #A50505 !important;
background-image: linear-gradient(
hsla(0, 94%, 33%, 1) 20%,
hsl(0,94%,54%) 90%

View File

@ -11,16 +11,16 @@ angular.module('starter.controllers', [])
$scope.backgroundpic = "1";
$scope.backgrounds = [
{ id: "1", name : "Hintergrund 1", backvalue : "1", beschreibung: "Herzen nit Tieren", image="http://api.raataar.de/rosen/bg_1.png"},
{ id: "2", name : "Hintergrund 2", backvalue : "2", beschreibung: "EngelHerz", image="http://api.raataar.de/rosen/bg_2.png"},
{ id: "3", name : "Hintergrund 3", backvalue : "3", beschreibung: "Herzenmuster", image="http://api.raataar.de/rosen/bg_3.png"},
{ id: "4", name : "Hintergrund 4", backvalue : "4", beschreibung: "Herzpflanzen", image="http://api.raataar.de/rosen/bg_4.png"},
{ id: "5", name : "Hintergrund 5", backvalue : "5", beschreibung: "Neutral dunkel", image="http://api.raataar.de/rosen/bg_5.png"},
{ id: "6", name : "Hintergrund 6", backvalue : "6", beschreibung: "Springendes Paar", image="http://api.raataar.de/rosen/bg_6.png"},
{ id: "7", name : "Hintergrund 7", backvalue : "7", beschreibung: "Herzen mit Verzierung", image="http://api.raataar.de/rosen/bg_7.png"},
{ id: "8", name : "Hintergrund 8", backvalue : "8", beschreibung: "Hand in Hand", image="http://api.raataar.de/rosen/bg_8.png"},
{ id: "9", name : "Hintergrund 9", backvalue : "9", beschreibung: "Stoffmuster", image="http://api.raataar.de/rosen/bg_9.png"},
{ id: "10", name : "Hintergrund 10", backvalue : "10", beschreibung: "Ballons mit Herzen", image="http://api.raataar.de/rosen/bg_10.png"},
{ id: "1", name : "Hintergrund 1", backvalue : "1", beschreibung: "Herzen nit Tieren", image: "http://api.raataar.de/rosen/bg/bg_1.png"},
{ id: "2", name : "Hintergrund 2", backvalue : "2", beschreibung: "EngelHerz", image: "http://api.raataar.de/rosen/bg/bg_2.png"},
{ id: "3", name : "Hintergrund 3", backvalue : "3", beschreibung: "Herzenmuster", image: "http://api.raataar.de/rosen/bg/bg_3.png"},
{ id: "4", name : "Hintergrund 4", backvalue : "4", beschreibung: "Herzpflanzen", image: "http://api.raataar.de/rosen/bg/bg_4.png"},
{ id: "5", name : "Hintergrund 5", backvalue : "5", beschreibung: "Neutral dunkel", image: "http://api.raataar.de/rosen/bg/bg_5.png"},
{ id: "6", name : "Hintergrund 6", backvalue : "6", beschreibung: "Springendes Paar", image: "http://api.raataar.de/rosen/bg/bg_6.png"},
{ id: "7", name : "Hintergrund 7", backvalue : "7", beschreibung: "Herzen mit Verzierung", image: "http://api.raataar.de/rosen/bg/bg_7.png"},
{ id: "8", name : "Hintergrund 8", backvalue : "8", beschreibung: "Hand in Hand", image: "http://api.raataar.de/rosen/bg/bg_8.png"},
{ id: "9", name : "Hintergrund 9", backvalue : "9", beschreibung: "Stoffmuster", image: "http://api.raataar.de/rosen/bg/bg_9.png"},
{ id: "10", name : "Hintergrund 10", backvalue : "10", beschreibung: "Ballons mit Herzen", image: "http://api.raataar.de/rosen/bg/bg_10.png"},
];

View File

@ -11,7 +11,7 @@
<textarea placeholder="" rows="4" cols="10" class="oleo-small" ng-model="$parent.freitext"></textarea>
</label>
<div
<div>
<div class="col col-100"><button class="button button-full button-small icon-left ion-android-hangout button-custom" ng-click="loadzitat()">kleine Hilfe? (Zufallstext)</button>
</div>
@ -47,12 +47,14 @@
</div>
<div style="padding-bottom:15px;">
<button class="button button-full button-custom" modal-select="" ng-model="backgroundpic" options="backgrounds" on-select="getBackgroundOpt(newValue, oldValue)" modal-title="Hintergrund wählen">
<button class="button button-full button-custom" modal-select="" ng-model="backgroundpic" options="backgrounds" on-select="getBackgroundOpt(newValue, oldValue)" modal-title="Hintergrund wählen" header-footer-class="bar-assertive bar-custom" cancel-button="Abbrechen" hide-reset="true">
{{ 'Hintergrund: ' + $parent.backgroundpic || 'Hintergrund'}}
<div class="option" class="item-thumbnail-left">
<img ng-src="{{option.image}}">
<h2>{{option.name}}</h2>
<p>{{option.beschreibung}}</p>
<div class="option">
<div class="row">
<div class="col col-20"><img ng-src="{{option.image}}" width="64" height="64"></div>
<div class="col col-80"><h2>{{option.name}}</h2><p>{{option.beschreibung}}</p></div>
</div>
</div>
</button>
</div>

View File

@ -43,6 +43,7 @@
}
.bar-custom{
background-color: #A50505 !important;
background-image: linear-gradient(
hsla(0, 94%, 33%, 1) 20%,
hsl(0,94%,54%) 90%

View File

@ -11,16 +11,16 @@ angular.module('starter.controllers', [])
$scope.backgroundpic = "1";
$scope.backgrounds = [
{ id: "1", name : "Hintergrund 1", backvalue : "1", beschreibung: "Herzen nit Tieren", image="http://api.raataar.de/rosen/bg_1.png"},
{ id: "2", name : "Hintergrund 2", backvalue : "2", beschreibung: "EngelHerz", image="http://api.raataar.de/rosen/bg_2.png"},
{ id: "3", name : "Hintergrund 3", backvalue : "3", beschreibung: "Herzenmuster", image="http://api.raataar.de/rosen/bg_3.png"},
{ id: "4", name : "Hintergrund 4", backvalue : "4", beschreibung: "Herzpflanzen", image="http://api.raataar.de/rosen/bg_4.png"},
{ id: "5", name : "Hintergrund 5", backvalue : "5", beschreibung: "Neutral dunkel", image="http://api.raataar.de/rosen/bg_5.png"},
{ id: "6", name : "Hintergrund 6", backvalue : "6", beschreibung: "Springendes Paar", image="http://api.raataar.de/rosen/bg_6.png"},
{ id: "7", name : "Hintergrund 7", backvalue : "7", beschreibung: "Herzen mit Verzierung", image="http://api.raataar.de/rosen/bg_7.png"},
{ id: "8", name : "Hintergrund 8", backvalue : "8", beschreibung: "Hand in Hand", image="http://api.raataar.de/rosen/bg_8.png"},
{ id: "9", name : "Hintergrund 9", backvalue : "9", beschreibung: "Stoffmuster", image="http://api.raataar.de/rosen/bg_9.png"},
{ id: "10", name : "Hintergrund 10", backvalue : "10", beschreibung: "Ballons mit Herzen", image="http://api.raataar.de/rosen/bg_10.png"},
{ id: "1", name : "Hintergrund 1", backvalue : "1", beschreibung: "Herzen nit Tieren", image: "http://api.raataar.de/rosen/bg/bg_1.png"},
{ id: "2", name : "Hintergrund 2", backvalue : "2", beschreibung: "EngelHerz", image: "http://api.raataar.de/rosen/bg/bg_2.png"},
{ id: "3", name : "Hintergrund 3", backvalue : "3", beschreibung: "Herzenmuster", image: "http://api.raataar.de/rosen/bg/bg_3.png"},
{ id: "4", name : "Hintergrund 4", backvalue : "4", beschreibung: "Herzpflanzen", image: "http://api.raataar.de/rosen/bg/bg_4.png"},
{ id: "5", name : "Hintergrund 5", backvalue : "5", beschreibung: "Neutral dunkel", image: "http://api.raataar.de/rosen/bg/bg_5.png"},
{ id: "6", name : "Hintergrund 6", backvalue : "6", beschreibung: "Springendes Paar", image: "http://api.raataar.de/rosen/bg/bg_6.png"},
{ id: "7", name : "Hintergrund 7", backvalue : "7", beschreibung: "Herzen mit Verzierung", image: "http://api.raataar.de/rosen/bg/bg_7.png"},
{ id: "8", name : "Hintergrund 8", backvalue : "8", beschreibung: "Hand in Hand", image: "http://api.raataar.de/rosen/bg/bg_8.png"},
{ id: "9", name : "Hintergrund 9", backvalue : "9", beschreibung: "Stoffmuster", image: "http://api.raataar.de/rosen/bg/bg_9.png"},
{ id: "10", name : "Hintergrund 10", backvalue : "10", beschreibung: "Ballons mit Herzen", image: "http://api.raataar.de/rosen/bg/bg_10.png"},
];

View File

@ -11,7 +11,7 @@
<textarea placeholder="" rows="4" cols="10" class="oleo-small" ng-model="$parent.freitext"></textarea>
</label>
<div
<div>
<div class="col col-100"><button class="button button-full button-small icon-left ion-android-hangout button-custom" ng-click="loadzitat()">kleine Hilfe? (Zufallstext)</button>
</div>
@ -47,12 +47,14 @@
</div>
<div style="padding-bottom:15px;">
<button class="button button-full button-custom" modal-select="" ng-model="backgroundpic" options="backgrounds" on-select="getBackgroundOpt(newValue, oldValue)" modal-title="Hintergrund wählen">
<button class="button button-full button-custom" modal-select="" ng-model="backgroundpic" options="backgrounds" on-select="getBackgroundOpt(newValue, oldValue)" modal-title="Hintergrund wählen" header-footer-class="bar-assertive bar-custom" cancel-button="Abbrechen" hide-reset="true">
{{ 'Hintergrund: ' + $parent.backgroundpic || 'Hintergrund'}}
<div class="option" class="item-thumbnail-left">
<img ng-src="{{option.image}}">
<h2>{{option.name}}</h2>
<p>{{option.beschreibung}}</p>
<div class="option">
<div class="row">
<div class="col col-20"><img ng-src="{{option.image}}" width="64" height="64"></div>
<div class="col col-80"><h2>{{option.name}}</h2><p>{{option.beschreibung}}</p></div>
</div>
</div>
</button>
</div>

View File

@ -43,6 +43,7 @@
}
.bar-custom{
background-color: #A50505 !important;
background-image: linear-gradient(
hsla(0, 94%, 33%, 1) 20%,
hsl(0,94%,54%) 90%

View File

@ -11,16 +11,16 @@ angular.module('starter.controllers', [])
$scope.backgroundpic = "1";
$scope.backgrounds = [
{ id: "1", name : "Hintergrund 1", backvalue : "1", beschreibung: "Herzen nit Tieren", image="http://api.raataar.de/rosen/bg_1.png"},
{ id: "2", name : "Hintergrund 2", backvalue : "2", beschreibung: "EngelHerz", image="http://api.raataar.de/rosen/bg_2.png"},
{ id: "3", name : "Hintergrund 3", backvalue : "3", beschreibung: "Herzenmuster", image="http://api.raataar.de/rosen/bg_3.png"},
{ id: "4", name : "Hintergrund 4", backvalue : "4", beschreibung: "Herzpflanzen", image="http://api.raataar.de/rosen/bg_4.png"},
{ id: "5", name : "Hintergrund 5", backvalue : "5", beschreibung: "Neutral dunkel", image="http://api.raataar.de/rosen/bg_5.png"},
{ id: "6", name : "Hintergrund 6", backvalue : "6", beschreibung: "Springendes Paar", image="http://api.raataar.de/rosen/bg_6.png"},
{ id: "7", name : "Hintergrund 7", backvalue : "7", beschreibung: "Herzen mit Verzierung", image="http://api.raataar.de/rosen/bg_7.png"},
{ id: "8", name : "Hintergrund 8", backvalue : "8", beschreibung: "Hand in Hand", image="http://api.raataar.de/rosen/bg_8.png"},
{ id: "9", name : "Hintergrund 9", backvalue : "9", beschreibung: "Stoffmuster", image="http://api.raataar.de/rosen/bg_9.png"},
{ id: "10", name : "Hintergrund 10", backvalue : "10", beschreibung: "Ballons mit Herzen", image="http://api.raataar.de/rosen/bg_10.png"},
{ id: "1", name : "Hintergrund 1", backvalue : "1", beschreibung: "Herzen nit Tieren", image: "http://api.raataar.de/rosen/bg/bg_1.png"},
{ id: "2", name : "Hintergrund 2", backvalue : "2", beschreibung: "EngelHerz", image: "http://api.raataar.de/rosen/bg/bg_2.png"},
{ id: "3", name : "Hintergrund 3", backvalue : "3", beschreibung: "Herzenmuster", image: "http://api.raataar.de/rosen/bg/bg_3.png"},
{ id: "4", name : "Hintergrund 4", backvalue : "4", beschreibung: "Herzpflanzen", image: "http://api.raataar.de/rosen/bg/bg_4.png"},
{ id: "5", name : "Hintergrund 5", backvalue : "5", beschreibung: "Neutral dunkel", image: "http://api.raataar.de/rosen/bg/bg_5.png"},
{ id: "6", name : "Hintergrund 6", backvalue : "6", beschreibung: "Springendes Paar", image: "http://api.raataar.de/rosen/bg/bg_6.png"},
{ id: "7", name : "Hintergrund 7", backvalue : "7", beschreibung: "Herzen mit Verzierung", image: "http://api.raataar.de/rosen/bg/bg_7.png"},
{ id: "8", name : "Hintergrund 8", backvalue : "8", beschreibung: "Hand in Hand", image: "http://api.raataar.de/rosen/bg/bg_8.png"},
{ id: "9", name : "Hintergrund 9", backvalue : "9", beschreibung: "Stoffmuster", image: "http://api.raataar.de/rosen/bg/bg_9.png"},
{ id: "10", name : "Hintergrund 10", backvalue : "10", beschreibung: "Ballons mit Herzen", image: "http://api.raataar.de/rosen/bg/bg_10.png"},
];

View File

@ -11,7 +11,7 @@
<textarea placeholder="" rows="4" cols="10" class="oleo-small" ng-model="$parent.freitext"></textarea>
</label>
<div
<div>
<div class="col col-100"><button class="button button-full button-small icon-left ion-android-hangout button-custom" ng-click="loadzitat()">kleine Hilfe? (Zufallstext)</button>
</div>
@ -47,12 +47,14 @@
</div>
<div style="padding-bottom:15px;">
<button class="button button-full button-custom" modal-select="" ng-model="backgroundpic" options="backgrounds" on-select="getBackgroundOpt(newValue, oldValue)" modal-title="Hintergrund wählen">
<button class="button button-full button-custom" modal-select="" ng-model="backgroundpic" options="backgrounds" on-select="getBackgroundOpt(newValue, oldValue)" modal-title="Hintergrund wählen" header-footer-class="bar-assertive bar-custom" cancel-button="Abbrechen" hide-reset="true">
{{ 'Hintergrund: ' + $parent.backgroundpic || 'Hintergrund'}}
<div class="option" class="item-thumbnail-left">
<img ng-src="{{option.image}}">
<h2>{{option.name}}</h2>
<p>{{option.beschreibung}}</p>
<div class="option">
<div class="row">
<div class="col col-20"><img ng-src="{{option.image}}" width="64" height="64"></div>
<div class="col col-80"><h2>{{option.name}}</h2><p>{{option.beschreibung}}</p></div>
</div>
</div>
</button>
</div>

View File

@ -18,7 +18,7 @@ document.getElementById(id+'Link').style.display = 'none';
<body>
<h1>Lint Report</h1>
<div class="titleSeparator"></div>
Check performed at Thu Feb 04 20:56:54 CET 2016.<br/>
Check performed at Thu Feb 04 21:44:26 CET 2016.<br/>
6 errors and 0 warnings found:<br/><br/>
<table class="overview">
<tr><td></td><td class="categoryColumn"><a href="#Correctness">Correctness</a>

View File

@ -7,5 +7,5 @@
# Location of the SDK. This is only used by Gradle.
# For customization when using a Version Control System, please read the
# header note.
#Thu Feb 04 20:55:02 CET 2016
#Thu Feb 04 21:43:58 CET 2016
sdk.dir=C\:\\Program Files (x86)\\Android\\android-sdk

View File

@ -51,15 +51,15 @@
{{ 'Hintergrund: ' + $parent.backgroundpic || 'Hintergrund'}}
<div class="option">
<div class="row">
<div class="col col-10"><img ng-src="{{option.image}}" width="64" height="64"></div>
<div class="col col-90"><h2>{{option.name}}</h2><p>{{option.beschreibung}}</p></div>
<div class="col col-20"><img ng-src="{{option.image}}" width="64" height="64"></div>
<div class="col col-80"><h2>{{option.name}}</h2><p>{{option.beschreibung}}</p></div>
</div>
</div>
</button>
</div>
<div class="list card">
<div>
<div class="item item-divider oleo">Rosen jetzt kaufen?</div>
<div class="row">
@ -74,6 +74,5 @@
</div>
</div>
</div>
</ion-content>
</ion-view>