Merge branch 'master' into mapquest
[potlatch2.git] / potlatch2.mxml
index fbf700e56f28d06f559188ed520809e240d8f6ba..72153cc000fba3eb44a324b3279f3229cabd6e4f 100644 (file)
        <mx:Style source="styles/Application.css"/>
 
     <mx:Glow id="glowImage" duration="100" 
-        alphaFrom="0.3" alphaTo="1.0" 
+        alphaFrom="0" alphaTo="0.8"
         blurXFrom="0.0" blurXTo="5.0" 
         blurYFrom="0.0" blurYTo="5.0" 
-        color="0xFF8000"/>
+        color="0x009ADE"/>
     <mx:Glow id="unglowImage" duration="100" 
-        alphaFrom="1.0" alphaTo="0.3" 
+        alphaFrom="0.8" alphaTo="0"
         blurXFrom="5.0" blurXTo="0.0" 
         blurYFrom="5.0" blurYTo="0.0" 
-        color="0xFF8000"/>
+        color="0x009ADE"/>
     <mx:WipeLeft id="wipeOut" duration="250"/>
     <mx:WipeRight id="wipeIn" duration="250"/>
 
         <mx:Canvas id="map_area" resize="onResizeMap()"
             top="0" left="0" width="100%" height="100%" dragEnter="dragEnterHandler(event);" dragDrop="dragDropHandler(event);">
         </mx:Canvas>
-        <mx:Image source="@Embed('embedded/zoomIn.svg')" right="3" top="3" click="theMap.zoomIn();"
+        <mx:Image source="@Embed('embedded/zoom_in.png')" right="7" top="3" click="theMap.zoomIn();"
             rollOverEffect="glowImage" rollOutEffect="unglowImage" toolTip="{'Zoom in - currently z'+getScale()}" />
-        <mx:Image source="@Embed('embedded/zoomOut.svg')" right="3" top="20" click="theMap.zoomOut();"
+        <mx:Image source="@Embed('embedded/zoom_out.png')" right="7" top="30" click="theMap.zoomOut();"
             rollOverEffect="glowImage" rollOutEffect="unglowImage" toolTip="{'Zoom out - currently z'+getScale()}" />
-        <mx:TextArea id="dataWorking" text="" right="20" top="3" disabledColor="black" backgroundDisabledColor="0xFFFFEA" height="18"
+        <mx:TextArea id="dataWorking" text="" right="35" top="3" disabledColor="black" backgroundDisabledColor="0xFFFFEA" height="18"
             enabled="false" borderThickness="0"
             showEffect="{wipeIn}" hideEffect="{wipeOut}"/>
         <mx:TextArea id="coordsbox" left="0" top="0" disabledColor="black" backgroundDisabledColor="0xFFFFEA" height="33"