Skip to content

Commit

Permalink
Merge pull request #3 from oetiker/simplify
Browse files Browse the repository at this point in the history
a bunch of updates
  • Loading branch information
oetiker authored May 15, 2018
2 parents 8217748 + ab6f937 commit 5c27dc3
Show file tree
Hide file tree
Showing 29 changed files with 2,208 additions and 78 deletions.
9 changes: 3 additions & 6 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,11 @@ USER node

# qooxdoo versioning

# npm variables
#ENV NPM_CONFIG_LOGLEVEL=warn
ENV NPM_CONFIG_PREFIX=/home/node/.npm-global

# access to bin
ENV PATH=$NPM_CONFIG_PREFIX/bin:$PATH
ENV PATH=/home/node/node_modules/.bin:$PATH

RUN npm install qxcompiler qooxdoo-sdk -g
COPY --chown=node:node package.json /home/node/
RUN cd /home/node && npm install && git clone --depth=1 https://github.com/qooxdoo/qooxdoo.git qooxdoo-sdk

WORKDIR /home/node/src
VOLUME /home/node/src
Expand Down
4 changes: 2 additions & 2 deletions Manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@
"email": "[email protected]"
}
],
"version" : "0.0.1",
"version" : "0.0.2",
"qooxdoo-range": "5.x - 6.0.0-alpha"
},

"provides" :
{
"namespace" : "iconfont.fontawesome5",
"namespace" : "iconfont",
"encoding" : "utf-8",
"class" : "source/class",
"resource" : "source/resource",
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,14 @@ $ qx contrib install ITISFoundation/qx-iconfont-fontawesome5

To induce the compiler to copy the font file you can either add a 'dummy' call to:

`iconfont.fontawesome5.Include;`
`iconfont.FontAwesome5;`

to your appliaction or you can explicitly include the class in the `compile.json` file.

Your app now knows about all the material icons. To access the icons
use names like:

`@MaterialIcon/sms_failed/40`
`@FontAwesome5Solid/book/40`

The demo app shows a list of all the icons available.

Expand Down
4 changes: 2 additions & 2 deletions compile.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,12 @@
"name": "iconbrowser",
"writeIndexHtmlToRoot": true,
"include": [
"iconfont.fontawesome5.Include"
"iconfont.FontAwesome5"
]
}
],
"libraries": [
"../.npm-global/lib/node_modules/qooxdoo-sdk/framework",
"../qooxdoo-sdk/framework",
"."
]
}
2 changes: 1 addition & 1 deletion source/class/iconbrowser/Application.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ qx.Class.define("iconbrowser.Application", {
// font files to the output class.
// you could also explicitly include the class in the compile.json file

// iconfont.material.Include;
// iconfont.FontAwesome5;

let copy = document.createElement("input");
document.body.appendChild(copy);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@
/**
* @asset(iconfont/fontawesome5/*)
*/
qx.Class.define("iconfont.fontawesome5.Include", {});
qx.Class.define("iconfont.FontAwesome5", {});
Loading

0 comments on commit 5c27dc3

Please sign in to comment.