diff --git a/systemres/main/resources/base/element/float.json b/systemres/main/resources/base/element/float.json index 87de0542507dd95bfdb1207750cd133bee8d1468..91b3028f1c1663c5256dcb59c49d1bd388296f2d 100644 --- a/systemres/main/resources/base/element/float.json +++ b/systemres/main/resources/base/element/float.json @@ -4,6 +4,30 @@ "name": "ohos_id_alpha_content_primary", "value": "0.9" }, + { + "name": "text_spinner_space", + "value": "8.0vp" + }, + { + "name": "small_text_spinner_space", + "value": "8.0vp" + }, + { + "name": "select_normal_left_margin", + "value": "8.0vp" + }, + { + "name": "select_small_left_margin", + "value": "4.0vp" + }, + { + "name": "select_normal_right_margin", + "value": "8.0vp" + }, + { + "name": "select_small_right_margin", + "value": "4.0vp" + }, { "name": "ohos_id_alpha_content_primary_dark", "value": "0.86" @@ -4096,6 +4120,10 @@ "name": "select_check_mark_font_weight", "value": "14.0" }, + { + "name": "select_font_weight", + "value": "10.0" + }, { "name": "textfield_container_border_radius_size", "value": "$float:corner_radius_level6" diff --git a/systemres/main/resources/base/element/id_defined.json b/systemres/main/resources/base/element/id_defined.json index e6acce3729731327cc6b7d8ae19c1dfd88612a0a..c1718ff2a944efea3f6dacf3f13a9a647bc5b5f4 100644 --- a/systemres/main/resources/base/element/id_defined.json +++ b/systemres/main/resources/base/element/id_defined.json @@ -33225,6 +33225,46 @@ "type": "float", "name": "checkbox_hotzone_padding_horizontal", "order": 6590 + }, + { + "type": "float", + "name": "text_spinner_space", + "order": 6591 + }, + { + "type": "float", + "name": "small_text_spinner_space", + "order": 6592 + }, + { + "type": "float", + "name": "select_normal_left_margin", + "order": 6593 + }, + { + "type": "float", + "name": "select_small_left_margin", + "order": 6594 + }, + { + "type": "float", + "name": "select_normal_right_margin", + "order": 6595 + }, + { + "type": "float", + "name": "select_small_right_margin", + "order": 6596 + }, + { + "type": "color", + "name": "outer_border_color", + "order": 6597 + }, + { + "type": "float", + "name": "select_font_weight", + "order": 6598 } ] } diff --git a/systemres/main/resources/base/element/pattern.json b/systemres/main/resources/base/element/pattern.json index 6af74d77c4093a7187c07e9707f57fd72155da2a..9d451b17777e98a81c233200d43b55003481dac8 100644 --- a/systemres/main/resources/base/element/pattern.json +++ b/systemres/main/resources/base/element/pattern.json @@ -6286,6 +6286,30 @@ "name": "bg_color", "value": "$color:select_menu_container_normal_color" }, + { + "name": "text_spinner_space", + "value": "$float:text_spinner_space" + }, + { + "name": "small_text_spinner_space", + "value": "$float:small_text_spinner_space" + }, + { + "name": "select_normal_left_margin", + "value": "$float:select_normal_left_margin" + }, + { + "name": "select_small_left_margin", + "value": "$float:select_small_left_margin" + }, + { + "name": "select_normal_right_margin", + "value": "$float:select_normal_right_margin" + }, + { + "name": "select_small_right_margin", + "value": "$float:select_small_right_margin" + }, { "name": "bg_color_select_button", "value": "$color:select_normal_bg_color" @@ -6406,6 +6430,10 @@ "name": "select_check_mark_font_weight", "value": "$float:select_check_mark_font_weight" }, + { + "name": "select_font_weight", + "value": "$float:select_font_weight" + }, { "name": "select_check_mark_font_size", "value": "24.0vp" diff --git a/systemres/main/resources/tv/element/color_sys.json b/systemres/main/resources/tv/element/color_sys.json index 4eb0037ae21dd49475ad996fb4d069db47a3ffe6..25cc94a476598f868214538a851c70df076b7ce1 100644 --- a/systemres/main/resources/tv/element/color_sys.json +++ b/systemres/main/resources/tv/element/color_sys.json @@ -28,6 +28,14 @@ "name": "interactive_pressed", "value": "#26FFFFFF" }, + { + "name": "select_font_color", + "value": "$color:font_primary" + }, + { + "name": "select_normal_bg_color", + "value": "$color:comp_background_tertiary" + }, { "name": "interactive_focus", "value": "#FF317AF7" @@ -480,6 +488,10 @@ "name": "comp_background_tertiary", "value": "#19FFFFFF" }, + { + "name": "outer_border_color", + "value": "#26FFFFFF" + }, { "name": "font_on_primary", "value": "#FFFFFFFF" diff --git a/systemres/main/resources/tv/element/float.json b/systemres/main/resources/tv/element/float.json index 8fd1c545c2e26fd0e536129f349389ab7b7f798b..e9e289de067643c537d729390919e9d8a8e8287b 100644 --- a/systemres/main/resources/tv/element/float.json +++ b/systemres/main/resources/tv/element/float.json @@ -68,6 +68,42 @@ "name": "ohos_id_text_size_body3", "value": "14.0fp" }, + { + "name": "text_spinner_space", + "value": "6.0vp" + }, + { + "name": "small_text_spinner_space", + "value": "0.0vp" + }, + { + "name": "select_normal_left_margin", + "value": "22.0vp" + }, + { + "name": "select_small_left_margin", + "value": "16.0vp" + }, + { + "name": "select_normal_right_margin", + "value": "10.0vp" + }, + { + "name": "select_small_right_margin", + "value": "8.0vp" + }, + { + "name": "Body_L", + "value": "24.0fp" + }, + { + "name": "Body_S", + "value": "18.0fp" + }, + { + "name": "select_font_weight", + "value": "13.0" + }, { "name": "ohos_id_text_size_caption", "value": "12.0vp" diff --git a/systemres/main/resources/tv/element/pattern.json b/systemres/main/resources/tv/element/pattern.json index 037c891593ed5c7433f8a73b49382a126a3b5794..8023f4792a4889cabf4c80d8cc55604d4127a63e 100644 --- a/systemres/main/resources/tv/element/pattern.json +++ b/systemres/main/resources/tv/element/pattern.json @@ -2071,17 +2071,33 @@ "name": "bg_color", "value": "#E62E3033" }, + { + "name": "select_normal_left_margin", + "value": "$float:select_normal_left_margin" + }, + { + "name": "select_small_left_margin", + "value": "$float:select_small_left_margin" + }, + { + "name": "select_normal_right_margin", + "value": "$float:select_normal_right_margin" + }, + { + "name": "select_small_right_margin", + "value": "$float:select_small_right_margin" + }, { "name": "bg_color_select_button", "value": "$color:select_normal_bg_color" }, { "name": "bg_color_hovered", - "value": "#4dffffff" + "value": "$color:interactive_hover" }, { "name": "bg_color_clicked", - "value": "#26FFFFFF" + "value": "$color:interactive_pressed" }, { "name": "bg_color_selected", @@ -2101,11 +2117,11 @@ }, { "name": "text_font_size", - "value": "$float:select_normal_text_font_size" + "value": "$float:Body_L" }, { "name": "small_text_font_size", - "value": "$float:ohos_id_text_size_body2" + "value": "$float:Body_S" }, { "name": "menu_back_blur_with_color", @@ -2181,7 +2197,7 @@ }, { "name": "select_symbol_color", - "value": "#E6FFFFFF" + "value": "$color:icon_primary" }, { "name": "focus_bg_outline_color", @@ -2249,19 +2265,19 @@ }, { "name": "spinner_width", - "value": "12.0vp" + "value": "16.0vp" }, { "name": "small_spinner_width", - "value": "10.0vp" + "value": "16.0vp" }, { "name": "spinner_height", - "value": "24.0vp" + "value": "32.0vp" }, { "name": "small_spinner_height", - "value": "20.0vp" + "value": "32.0vp" }, { "name": "default_divider_width", @@ -2281,11 +2297,11 @@ }, { "name": "select_min_height", - "value": "40.0vp" + "value": "54.0vp" }, { "name": "small_select_min_height", - "value": "28.0vp" + "value": "38.0vp" }, { "name": "icon_side_length", @@ -2341,7 +2357,7 @@ }, { "name": "select_font_color", - "value": "$color:select_normal_font_color" + "value": "$color:font_primary" }, { "name": "select_option_show_count", @@ -2373,7 +2389,7 @@ }, { "name": "select_itself_icon_size", - "value": "8.0vp" + "value": "16.0vp" }, { "name": "select_is_tv", @@ -2539,6 +2555,14 @@ "name": "menu_background_blur_style", "value": "$float:menu_background_blur_style" }, + { + "name": "text_spinner_space", + "value": "$float:text_spinner_space" + }, + { + "name": "small_text_spinner_space", + "value": "$float:small_text_spinner_space" + }, { "name": "menu_item_need_focus", "value": "1" @@ -2569,11 +2593,11 @@ }, { "name": "select_normal_border_width", - "value": "0.5vp" + "value": "1.0vp" }, { "name": "select_normal_border_color", - "value": "#26FFFFFF" + "value": "$color:outer_border_color" }, { "name": "select_normal_shadow", @@ -2589,11 +2613,11 @@ }, { "name": "select_focused_text_color", - "value": "#e5ffffff" + "value": "$color:font_primary" }, { "name": "select_focused_back_ground_color", - "value": "#7FFFFFFF" + "value": "$color:comp_background_focus" }, { "name": "menu_normal_border_width", @@ -2669,7 +2693,7 @@ }, { "name": "select_focused_symbol_color", - "value": "$color:select_focus_text_color" + "value": "$color:icon_primary" }, { "name": "select_focused_icon_color",