Merge "Marked new API's since 1.1.4" into devel/master

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / styles / 720x1280 / dali-toolkit-default-theme.json

diff --git a/dali-toolkit/styles/720x1280/dali-toolkit-default-theme.json b/dali-toolkit/styles/720x1280/dali-toolkit-default-theme.json
index 7b4def1..694e2db 100644 (file)
--- a/dali-toolkit/styles/720x1280/dali-toolkit-default-theme.json
+++ b/dali-toolkit/styles/720x1280/dali-toolkit-default-theme.json
@@ -99,7 +99,7 @@ distributing this software or its derivatives.
       "popup-divider-color":[0.23,0.72,0.8,0.11],
       "popup-icon-color":[1.0,1.0,1.0,1.0],
       "popup-pressed-color":[0.24,0.72,0.8,0.11],
-      "background-image": {
+      "background": {
         "filename": "{DALI_IMAGE_DIR}selection-popup-bg.9.png"
         },
       "popup-fade-in-duration":0.25,
@@ -110,9 +110,13 @@ distributing this software or its derivatives.
       "label":
       {
         "point-size":8,
-        "font-style":"Light"
+        "font-style":"{\"weight\":\"light\"}"
       }
     },
+    "textselectiontoolbar":
+    {
+      "enable-overshoot":true
+    },
     "scrollview":
     {
       "overshoot-effect-color":"B018"