Merge "Fixed bug in 3x3 NPatch shader and Color visual shader" 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 25b2375..923680d 100644 (file)
--- a/dali-toolkit/styles/720x1280/dali-toolkit-default-theme.json
+++ b/dali-toolkit/styles/720x1280/dali-toolkit-default-theme.json
@@ -116,7 +116,7 @@
       "label":
       {
         "pointSize":8,
-        "fontStyle":"{\"weight\":\"light\"}"
+        "fontStyle":{"weight":"light"}
       }
     },
     "TextSelectionToolbar":
@@ -188,6 +188,22 @@
     "SliderHandleTextLabel":
     {
       "textColor":[0.8,0.8,1,1]
+    },
+    "ProgressBar":
+    {
+      "progressValue": 0,
+      "trackVisual":{
+        "url":"{DALI_IMAGE_DIR}slider-skin.9.png",
+        "size":[24,24]
+      },
+      "progressVisual":{
+        "url":"{DALI_IMAGE_DIR}slider-skin-progress.9.png",
+        "size":[24,24]
+      }
+    },
+    "ProgressBarValueTextLabel":
+    {
+      "textColor":[0.8,0.8,1,1]
     }
   }
 }