Merge pull request #8 from oetiker/fa59

updated to font awesome 5.9
ITISFoundation · Jul 10, 2019 · 7836b0f · 7836b0f
2 parents 2b630fe + 937876a
commit 7836b0f
Show file tree

Hide file tree

Showing 28 changed files with 22,600 additions and 9,064 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:8.9.2
+FROM node:10
 
 LABEL maintainer="oetiker" \
       description="Qooxdoo Font Awesome 5 Icon Font"
@@ -12,7 +12,7 @@ USER node
 ENV PATH=/home/node/node_modules/.bin:$PATH
 
 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
+RUN cd /home/node && npm install
 
 WORKDIR /home/node/src
 VOLUME  /home/node/src

diff --git a/Manifest.json b/Manifest.json
@@ -1,35 +1,24 @@
 {
-  "info" :
-  {
-    "name" : "qx-iconfont-fontawesome5",
-
-    "summary" : "font awesome 5 iconfont",
-    "description" : "qooxdoo integration of the font awesome iconfonts",
-    "homepage" : "https://github.com/ITISFoundation/qx-iconfont-fontawesome5",
-
-    "license" : "MIT license",
-    "authors" : [
-      {
-        "name": "Tobias Oetiker (oetiker)",
-        "email": "[email protected]"
-      }
-    ],
-    "version" : "0.0.6"
+  "info": {
+    "name": "qx-iconfont-fontawesome5",
+    "summary": "font awesome 5 iconfont",
+    "description": "qooxdoo integration of the font awesome iconfonts",
+    "homepage": "https://github.com/ITISFoundation/qx-iconfont-fontawesome5",
+    "license": "MIT license",
+    "authors": [],
+    "version": "0.1.0"
   },
-
-  "provides" :
-  {
-    "namespace"   : "iconfont.fontawesome5",
-    "encoding"    : "utf-8",
-    "class"       : "source/class",
-    "resource"    : "source/resource",
-    "translation" : "source/translation",
-    "type"        : "contribution",
+  "provides": {
+    "namespace": "iconfont.fontawesome5",
+    "encoding": "utf-8",
+    "class": "source/class",
+    "resource": "source/resource",
+    "translation": "source/translation",
     "webfonts": [
       {
         "name": "FontAwesome5Brands",
         "defaultSize": 32,
-        "comparisonString": "\uf26e\uf368",
+        "comparisonString": "\\uf26e\\uf368",
         "mapping": "iconfont/fontawesome5/fa-brands.json",
         "resources": [
           "iconfont/fontawesome5/fa-brands-400.eot",
@@ -41,7 +30,7 @@
       {
         "name": "FontAwesome5Regular",
         "defaultSize": 32,
-        "comparisonString": "\uf2b9\uf2bb",
+        "comparisonString": "\\uf2b9\\uf2bb",
         "mapping": "iconfont/fontawesome5/fa-regular.json",
         "resources": [
           "iconfont/fontawesome5/fa-regular-400.eot",
@@ -53,18 +42,20 @@
       {
         "name": "FontAwesome5Solid",
         "defaultSize": 32,
-        "comparisonString": "\uf2b9\uf2bb",
+        "comparisonString": "\\uf2b9\\uf2bb",
         "mapping": "iconfont/fontawesome5/fa-solid.json",
         "resources": [
           "iconfont/fontawesome5/fa-solid-900.eot",
           "iconfont/fontawesome5/fa-solid-900.woff2",
           "iconfont/fontawesome5/fa-solid-900.woff",
-          "iconfont/fontawesome5/fa-solid-900.ttf" 
+          "iconfont/fontawesome5/fa-solid-900.ttf"
         ]
       }
     ]
   },
   "requires": {
-    "qooxdoo-sdk": "^6.0.0-alpha"
-  }
+    "@qooxdoo/framework": "^6.0.0-alpha",
+    "@qooxdoo/compiler": "^1.0.0-beta.20190708-0855"
+  },
+  "$schema": "https://raw.githubusercontent.com/qooxdoo/qooxdoo-compiler/master/source/resource/qx/tool/schema/Manifest-1-0-0.json"
 }
diff --git a/README.md b/README.md
@@ -8,9 +8,9 @@
 ## Using the iconfont in your Application
 
 ```console
-$ qx contrib update
-$ qx contrib list
-$ qx contrib install ITISFoundation/qx-iconfont-fontawesome5
+$ qx package update
+$ qx package list
+$ qx package install ITISFoundation/qx-iconfont-fontawesome5
 ```
 
 To induce the compiler to copy the font file you can either add a 'dummy' call to:
@@ -48,7 +48,7 @@ and give this a whirl.
    ```console
    $ docker-compose up
    ```
-  Now you can open http://localhost:31754 to see the widgetbrowser. The selectbox in the top right corner lets you select the OSparc theme.
+  Now you can open http://localhost:31754 to see fonticon browser.
 
 If you want to run a different qx command, you can do this too
 

diff --git a/compile.json b/compile.json
@@ -28,14 +28,9 @@
       "class": "iconbrowser.Application",
       "theme": "qx.theme.Simple",
       "name": "iconbrowser",
-      "writeIndexHtmlToRoot": true,
       "include": [
         "iconfont.fontawesome5.Load"
       ]
     }
-  ],
-  "libraries": [
-    "./node_modules/qooxdoo-sdk/framework",
-    "."
   ]
 }