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

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

diff --git a/resources/style/demo-theme.json.in b/resources/style/demo-theme.json.in
index d2492b5..1203c52 100644 (file)
--- a/resources/style/demo-theme.json.in
+++ b/resources/style/demo-theme.json.in
@@ -1,5 +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
@@ -15,66 +16,49 @@
  */
 
 {
-  "constants":
-  {
-    "DEMO_IMAGE_DIR":"@DEMO_STYLE_IMAGE_DIR@"
-  },
+  "includes":
+  [
+    "{APPLICATION_RESOURCE_PATH}/style/base-theme.json"
+  ],
 
   "styles":
   {
-    "confirmationpopup":{
-      "popupBackgroundImage":"{DEMO_IMAGE_DIR}00_popup_bg.9.png"
-    },
-
-    "textlabel-Rosemary":
+    "DemoTile":
     {
-      "fontFamily":"Rosemary"
-    },
-    "textlabel":
-    {
-      "fontStyle":"Regular",
-      "pointSize":18
-    },
-    "launcherlabel":
-    {
-      "pointSize":18
-    },
-
-    "toolbarlabel":
-    {
-      "pointSize":18
+      "styles":[ "DemoTileBase" ]
     },
 
-    "builderlabel":
+    "LauncherBackground":
     {
-      "pointSize":13
+      "background":
+      {
+        "visualType": "GRADIENT",
+        "center": [240, 400],
+        "radius": 932,
+        "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":9
+      "color": [ 0.3647, 0.7569, 0.8157, 0.32 ]
     },
 
-    "buttonlabel":
+    "BubbleColor3":
     {
-      "pointSize":11
+      "color": [ 0.3804, 0.7412, 0.6510, 0.32 ]
     },
 
-    "launcherbackground":
+    "BubbleColor4":
     {
-      "background":
-      {
-        "rendererType": "gradient",
-        "center": [240, 400],
-        "radius": 932,
-        "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 ]
     }
+
   }
 }