flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bigosma...@apache.org
Subject [24/35] git commit: [flex-asjs] [refs/heads/develop] - Push changes in order to test class names fixes from Alex
Date Tue, 10 Jan 2017 08:25:15 GMT
Push changes in order to test class names fixes from Alex


Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/0f9afd8c
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/0f9afd8c
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/0f9afd8c

Branch: refs/heads/develop
Commit: 0f9afd8c19bcaee626f24dcacce4acbc809ac3e9
Parents: 4ae4795
Author: piotrz <piotrz@apache.org>
Authored: Sat Jan 7 01:18:22 2017 +0100
Committer: piotrz <piotrz@apache.org>
Committed: Sat Jan 7 01:18:22 2017 +0100

----------------------------------------------------------------------
 .../src/main/flex/itemRenderers/MemberItemRenderer.mxml  | 11 ++++++-----
 .../FontAwesome/src/main/resources/fa-manifest.xml       |  2 ++
 2 files changed, 8 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/0f9afd8c/examples/flexjs/FlexTeamPage_MDL/src/main/flex/itemRenderers/MemberItemRenderer.mxml
----------------------------------------------------------------------
diff --git a/examples/flexjs/FlexTeamPage_MDL/src/main/flex/itemRenderers/MemberItemRenderer.mxml
b/examples/flexjs/FlexTeamPage_MDL/src/main/flex/itemRenderers/MemberItemRenderer.mxml
index 7edae67..ab1ff19 100644
--- a/examples/flexjs/FlexTeamPage_MDL/src/main/flex/itemRenderers/MemberItemRenderer.mxml
+++ b/examples/flexjs/FlexTeamPage_MDL/src/main/flex/itemRenderers/MemberItemRenderer.mxml
@@ -26,6 +26,7 @@ limitations under the License.
 
     <fx:Script>
 		<![CDATA[
+        import org.apache.flex.fa.FontAwesomeIconSize;
         import org.apache.flex.fa.FontAwesomeIconType;
 
         import vos.MemberVO;
@@ -58,27 +59,27 @@ limitations under the License.
         <mdl:CardActions border="true">
             <mdl:Button colored="true" fab="true" ripple="true" raised="false" primary="true">
                 <mdl:materialIcon>
-                    <fa:FontAwesomeIcon iconType="fa-twitter" />
+                    <fa:FontAwesomeIcon iconType="{FontAwesomeIconType.TWITTER}" />
                 </mdl:materialIcon>
             </mdl:Button>
             <mdl:Button colored="true" fab="true" ripple="true" raised="false" accent="true">
                 <mdl:materialIcon>
-                    <fa:FontAwesomeIcon iconType="fa-linkedin" />
+                    <fa:FontAwesomeIcon iconType="{FontAwesomeIconType.LINKEDIN}" />
                 </mdl:materialIcon>
             </mdl:Button>
             <mdl:Button colored="true" fab="true" ripple="true" raised="false">
                 <mdl:materialIcon>
-                    <fa:FontAwesomeIcon iconType="fa-facebook" />
+                    <fa:FontAwesomeIcon iconType="{FontAwesomeIconType.GITHUB}" />
                 </mdl:materialIcon>
             </mdl:Button>
             <mdl:Button colored="true" fab="true" ripple="true" raised="false">
                 <mdl:materialIcon>
-                    <fa:FontAwesomeIcon iconType="fa-github" />
+                    <fa:FontAwesomeIcon iconType="{FontAwesomeIconType.GITHUB}" />
                 </mdl:materialIcon>
             </mdl:Button>
             <mdl:Button colored="true" fab="true" ripple="true" raised="false">
                 <mdl:materialIcon>
-                    <fa:FontAwesomeIcon iconType="fa-glass" size="fa-lg"  />
+                    <fa:FontAwesomeIcon iconType="{FontAwesomeIconType.GLASS}" size="{FontAwesomeIconSize.X1}"
 />
                 </mdl:materialIcon>
             </mdl:Button>
         </mdl:CardActions>

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/0f9afd8c/frameworks/projects/FontAwesome/src/main/resources/fa-manifest.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/FontAwesome/src/main/resources/fa-manifest.xml b/frameworks/projects/FontAwesome/src/main/resources/fa-manifest.xml
index a6fe235..bd52976 100644
--- a/frameworks/projects/FontAwesome/src/main/resources/fa-manifest.xml
+++ b/frameworks/projects/FontAwesome/src/main/resources/fa-manifest.xml
@@ -21,4 +21,6 @@
 
 <componentPackage>
     <component id="FontAwesomeIcon" class="org.apache.flex.fa.FontAwesomeIcon"/>
+    <component id="FontAwesomeIconType" class="org.apache.flex.fa.FontAwesomeIconType"/>
+    <component id="FontAwesomeIconSize" class="org.apache.flex.fa.FontAwesomeIconSize"/>
 </componentPackage>


Mime
View raw message