Merged from Master

2016-01-14 17:23:53 -08:00
parent 3e7eb11d84 88f8925d17
commit 032b2542f0
84 changed files with 605 additions and 3970 deletions
--- a/platform/commonUI/themes/espresso/bundle.json
+++ b/platform/commonUI/themes/espresso/bundle.json
@@ -1,18 +0,0 @@
-{
-    "name": "Espresso",
-    "description": "Espresso theme: dark and rich",
-    "extensions": {
-        "stylesheets": [
-            {
-                "stylesheetUrl": "css/theme-espresso.css",
-                "priority": 1000
-            }
-        ],
-        "constants": [
-            {
-                "key": "THEME",
-                "value": "espresso"
-            }
-        ]
-    }
-}