projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Changed default font family of 7.0 IoT UX" 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
3627ef4
..
4ebae21
100644
(file)
--- a/
dali-toolkit/styles/720x1280/dali-toolkit-default-theme.json
+++ b/
dali-toolkit/styles/720x1280/dali-toolkit-default-theme.json
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 20
17
Samsung Electronics Co., Ltd.
+ * Copyright (c) 20
21
Samsung Electronics Co., Ltd.
*
* This file is part of Dali Toolkit
*
*
* This file is part of Dali Toolkit
*
@@
-98,29
+98,35
@@
},
"TextSelectionPopup":
{
},
"TextSelectionPopup":
{
- "popupMaxSize":[656,72],
- "optionDividerSize":[2,0],
- "popupDividerColor":[0.23,0.72,0.8,0.11],
+ "popupMaxSize":[656,40],
+ "optionDividerSize":[0,0],
+ "optionDividerPadding":[0.0,0.0,0.0,0.0],
+ "popupDividerColor":[0.0,0.0,0.0,1.0],
"popupIconColor":[1.0,1.0,1.0,1.0],
"popupPressedColor":[0.24,0.72,0.8,0.11],
"background": {
"visualType": "IMAGE",
"popupIconColor":[1.0,1.0,1.0,1.0],
"popupPressedColor":[0.24,0.72,0.8,0.11],
"background": {
"visualType": "IMAGE",
- "url": "{DALI_IMAGE_DIR}selection-popup-background.9.png"
+ "url": "{DALI_IMAGE_DIR}
IoT-
selection-popup-background.9.png"
},
"backgroundBorder": {
"visualType": "IMAGE",
},
"backgroundBorder": {
"visualType": "IMAGE",
- "url": "{DALI_IMAGE_DIR}selection-popup-border.9.png",
- "mixColor":[
0.24,0.72,0.8
,1.0]
+ "url": "{DALI_IMAGE_DIR}
IoT-
selection-popup-border.9.png",
+ "mixColor":[
1.0,1.0,1.0
,1.0]
},
"popupFadeInDuration":0.25,
"popupFadeOutDuration":0.25
},
"TextSelectionPopupButton":
{
},
"popupFadeInDuration":0.25,
"popupFadeOutDuration":0.25
},
"TextSelectionPopupButton":
{
+ "minimumSize":[0,40],
+ "labelPadding":[-4.0,-4.0,0.0,0.0],
"label":
{
"visualType":"TEXT",
"label":
{
"visualType":"TEXT",
- "pointSize":8
+ "pointSize":6.0,
+ "textColor":[0.04,0.06,0.13,1.0],
+ "fontFamily":"BreezeSans",
+ "fontStyle" : {"weight":"regular"}
},
"unselectedBackgroundVisual":
{
},
"unselectedBackgroundVisual":
{
@@
-136,7
+142,7
@@
"TextSelectionToolbar":
{
"enableOvershoot":true,
"TextSelectionToolbar":
{
"enableOvershoot":true,
- "enableScrollBar":
tru
e,
+ "enableScrollBar":
fals
e,
"scrollView":
{
"overshootAnimationSpeed":360.0,
"scrollView":
{
"overshootAnimationSpeed":360.0,