Attempt to move the font awesome css file to the library itself, instead of in the end app project
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/a20d30ac Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/a20d30ac Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/a20d30ac Branch: refs/heads/develop Commit: a20d30ac603ebc385a9acb593988714f996d50ec Parents: 36ca8ac Author: OmPrakash Muppirala <bigosma...@gmail.com> Authored: Wed Jan 4 02:45:07 2017 -0800 Committer: OmPrakash Muppirala <bigosma...@gmail.com> Committed: Wed Jan 4 02:45:07 2017 -0800 ---------------------------------------------------------------------- .../src/main/resources/mdl-js-index-template.html | 1 - .../src/main/flex/org/apache/flex/fa/FontAwesomeIcon.as | 5 +++++ 2 files changed, 5 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/a20d30ac/examples/flexjs/FlexTeamPage_MDL/src/main/resources/mdl-js-index-template.html ---------------------------------------------------------------------- diff --git a/examples/flexjs/FlexTeamPage_MDL/src/main/resources/mdl-js-index-template.html b/examples/flexjs/FlexTeamPage_MDL/src/main/resources/mdl-js-index-template.html index 5999f04..62cbf70 100644 --- a/examples/flexjs/FlexTeamPage_MDL/src/main/resources/mdl-js-index-template.html +++ b/examples/flexjs/FlexTeamPage_MDL/src/main/resources/mdl-js-index-template.html @@ -24,7 +24,6 @@ <link rel="stylesheet" type="text/css" href="${application}.css"> <link rel="stylesheet" href="https://fonts.googleapis.com/icon?family=Material+Icons";> <link rel="stylesheet" href="https://code.getmdl.io/1.2.1/material.${primary}-${accent}.min.css";> - <link rel="stylesheet" href="http://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css";> <script defer src="https://code.getmdl.io/1.2.1/material.min.js";></script> ${head} </head> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/a20d30ac/frameworks/projects/FontAwesome/src/main/flex/org/apache/flex/fa/FontAwesomeIcon.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/FontAwesome/src/main/flex/org/apache/flex/fa/FontAwesomeIcon.as b/frameworks/projects/FontAwesome/src/main/flex/org/apache/flex/fa/FontAwesomeIcon.as index 7c86c75..05b5ec4 100644 --- a/frameworks/projects/FontAwesome/src/main/flex/org/apache/flex/fa/FontAwesomeIcon.as +++ b/frameworks/projects/FontAwesome/src/main/flex/org/apache/flex/fa/FontAwesomeIcon.as @@ -34,6 +34,11 @@ package org.apache.flex.fa * @playerversion Flash 10.2 * @playerversion AIR 2.6 * @productversion FlexJS 0.0 + * + * <inject_html> + * <link rel="stylesheet" href="http://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css";> + * <inject_html> + * */ public class FontAwesomeIcon extends UIBase {
