Merge pull request #33 from oetiker/theme-folder

move resources into theme folder
ITISFoundation · Oct 4, 2019 · 5c077d5 · 5c077d5
2 parents 7171ee7 + 0d37055
commit 5c077d5
Show file tree

Hide file tree

Showing 44 changed files with 9 additions and 2,415 deletions.
diff --git a/Manifest.json b/Manifest.json
@@ -11,7 +11,7 @@
         "email": "tobi@itis.swiss"
       }
     ],
-    "version": "0.4.10"
+    "version": "0.4.11"
   },
   "provides": {
     "namespace": "osparc.theme",

diff --git a/source/class/osparc/theme/osparcdark/Font.js b/source/class/osparc/theme/osparcdark/Font.js
@@ -17,10 +17,10 @@
     theme included with Qooxdoo.
 ************************************************************************ */
 /**
- * @asset(osparc/font/*.woff)
- * @asset(osparc/font/*.woff2)
- * @asset(osparc/font/*.eot)
- * @asset(osparc/font/*.ttf)
+ * @asset(osparc/theme/font/*.woff)
+ * @asset(osparc/theme/font/*.woff2)
+ * @asset(osparc/theme/font/*.eot)
+ * @asset(osparc/theme/font/*.ttf)
  */
 /**
  * The simple qooxdoo font theme.
@@ -35,10 +35,10 @@ qx.Theme.define("osparc.theme.osparcdark.Font", {
         {
           family: "Roboto",
           source: [
-            "osparc/font/roboto-v18-latin_latin-ext-regular.eot",
-            "osparc/font/roboto-v18-latin_latin-ext-regular.woff2",
-            "osparc/font/roboto-v18-latin_latin-ext-regular.woff",
-            "osparc/font/roboto-v18-latin_latin-ext-regular.ttf"
+            "osparc/theme/font/roboto-v18-latin_latin-ext-regular.eot",
+            "osparc/theme/font/roboto-v18-latin_latin-ext-regular.woff2",
+            "osparc/theme/font/roboto-v18-latin_latin-ext-regular.woff",
+            "osparc/theme/font/roboto-v18-latin_latin-ext-regular.ttf"
           ]
         }
       ]

diff --git a/source/resource/osparc/font/LICENSE.txt b/source/resource/osparc/font/LICENSE.txt