[dali_1.4.39] Merge branch 'devel/master'

[platform/core/uifw/dali-demo.git] / resources / style / mobile / demo-theme.json.in

diff --git a/resources/style/mobile/demo-theme.json.in b/resources/style/mobile/demo-theme.json.in
index f8b5099..05578b7 100644 (file)
--- a/resources/style/mobile/demo-theme.json.in
+++ b/resources/style/mobile/demo-theme.json.in
@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2000-2016 Samsung Electronics Co., Ltd
-
+ * Copyright (c) 2019 Samsung Electronics Co., Ltd.
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -16,78 +16,49 @@
  */
 
 {
+  "includes":
+  [
+    "{APPLICATION_RESOURCE_PATH}/style/base-theme.json"
+  ],
+
   "styles":
   {
-    "TextLabelRosemary":
-    {
-      "fontFamily":"Rosemary"
-    },
-    "TextLabel":
-    {
-      "fontStyle":"Regular",
-      "pointSize":18
-    },
-    "TextLabelFontSize0":
-    {
-      "pointSize":8
-    },
-    "TextLabelFontSize1":
-    {
-      "pointSize":10
-    },
-    "TextLabelFontSize2":
-    {
-      "pointSize":15
-    },
-    "TextLabelFontSize3":
-    {
-      "pointSize":19
-    },
-    "TextLabelFontSize4":
-    {
-      "pointSize":25
-    },
-
-    "Launcherlabel":
-    {
-      "pointSize":8
-    },
-
-    "ToolbarLabel":
+    "DemoTile":
     {
-      "pointSize":10
+      "styles":[ "DemoTileBase" ]
     },
 
-    "BuilderLabel":
+    "LauncherBackground":
     {
-      "pointSize":10
+      "background":
+      {
+        "visualType": "GRADIENT",
+        "center": [360, 640],
+        "radius": 1468,
+        "units": "USER_SPACE",
+        "stopColor": [[0.247,0.38,0.52,1.0],[0.055,0.18,0.286,1.0]]
+      }
     },
 
-    "ScrollView":
+    "BubbleColor1":
     {
-      "overshootEffectColor":"B018"
+      "color": [ 0.3255, 0.3412, 0.6353, 0.32 ]
     },
 
-    "GroupLabel":
+    "BubbleColor2":
     {
-      "pointSize":6
+      "color": [ 0.3647, 0.7569, 0.8157, 0.32 ]
     },
 
-    "ButtonLabel":
+    "BubbleColor3":
     {
-      "pointSize":8
+      "color": [ 0.3804, 0.7412, 0.6510, 0.32 ]
     },
 
-    "LauncherBackground":
+    "BubbleColor4":
     {
-      "background":
-      {
-        "visualType": "GRADIENT",
-        "center": [360, 640],
-        "radius": 1468,
-        "units": "USER_SPACE",
-        "stopColor": [[0.247,0.38,0.52,1.0],[0.055,0.18,0.286,1.0]]
-      }
+      "color": [ 1, 1, 1, 0.13 ]
     }
+
   }
 }