old changes

matt4446 · Feb 24, 2017 · c6fcc94 · c6fcc94
1 parent 36d6ab6
commit c6fcc94
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 15 deletions.
diff --git a/app/controls/nav/nav.ts b/app/controls/nav/nav.ts
@@ -20,11 +20,11 @@ import { MaterialIcon } from "../icons/material-icon";
                         <Label text="menu" [material-icon] class="title nav-icon" (tap)="menuButtonTap($event)"></Label>
                     </StackLayout>
 
-                    <StackLayout orientation="horizontal" col="1" class="highlight" verticalAlignment="center">
+                    <StackLayout orientation="horizontal" col="1" verticalAlignment="center">
                         <ng-content select="[main-header]"></ng-content>    
                     </StackLayout>  
 
-                    <StackLayout orientation="horizontal" col="2" class="highlight" verticalAlignment="center">
+                    <StackLayout orientation="horizontal" col="2" class="text-right" verticalAlignment="center">
                         <ng-content select="[nav-right]"></ng-content>    
                     </StackLayout>   
                 </GridLayout>

diff --git a/app/controls/pullToRefresh/pullToRefresh.control.ts b/app/controls/pullToRefresh/pullToRefresh.control.ts
@@ -74,30 +74,30 @@ export class NxPullToRefreshView{
         this.shrink();
     }
 
-    private animateContentChildElement: PullToRefreshAnimateElement;
-    @ContentChild(PullToRefreshAnimateElement)
-    public set contentChildren(element)
+    private animateContentChildElement: PullToRefreshAnimateElement[];
+    @ContentChildren(PullToRefreshAnimateElement)
+    public set contentChildren(elements)
     {
-        this.animateContentChildElement = element;
+        this.animateContentChildElement = elements.toArray();
     }
 
-    private animateViewChild : PullToRefreshAnimateElement;
-    @ViewChild(PullToRefreshAnimateElement)
-    public set viewChildren(element){
-        this.animateViewChild = element;
+    private animateViewChild : PullToRefreshAnimateElement[];
+    @ViewChildren(PullToRefreshAnimateElement)
+    public set viewChildren(elements){
+        this.animateViewChild = elements.toArray();
     }
 
     private get AnimateElements() : PullToRefreshAnimateElement[]{
         let a = [];
-        if(this.animateContentChildElement)
+        if(this.animateContentChildElement && this.animateContentChildElement.length > 0)
         {
             this.logger.Notify("animateContentChildElement");
-            a.push(this.animateContentChildElement); 
+            this.animateContentChildElement.forEach(item => { a.push(item); });
         }
-        if(this.animateViewChild)
+        if(this.animateViewChild && this.animateViewChild.length > 0)
         { 
             this.logger.Notify("animateViewChild");
-            a.push(this.animateViewChild); 
+            this.animateViewChild.forEach(item => { a.push(item); });
         }
 
         if(a.length === 0){

diff --git a/app/pages/competition/startList/competitors/competitors.page.ts b/app/pages/competition/startList/competitors/competitors.page.ts
@@ -106,7 +106,8 @@ export class StartGroup{
                                 <label [text]="person.Club" class="note"></label>
                                 <!-- todo : change to score. --> 
                                 <ion-icon item-right icon="ion-flame"></ion-icon>
-                                <Label item-right text="person.Total" textWrap="true"></Label>
+                                <Label class='note' item-right [text]="person.Total | number:'3.3-3'" textWrap="true"></Label>
+                                
                             </nx-item>
                         </nx-list>
                     </StackLayout>