From 48f610fd1c5d24d1cba8adf660533b237911c395 Mon Sep 17 00:00:00 2001
From: shihongzhao <shihongzhao@huawei.com>
Date: Thu, 20 Jan 2022 11:45:13 +0800
Subject: [PATCH] Modifying UX Adaptation

Signed-off-by: shihongzhao <shihongzhao@huawei.com>
---
 .../main/resources/base/element/float.json    | 52 +++++++++++++++
 .../resources/base/element/id_defined.json    | 65 +++++++++++++++++++
 2 files changed, 117 insertions(+)

diff --git a/systemres/main/resources/base/element/float.json b/systemres/main/resources/base/element/float.json
index c258a5ad..2f0e740b 100644
--- a/systemres/main/resources/base/element/float.json
+++ b/systemres/main/resources/base/element/float.json
@@ -172,6 +172,58 @@
             "name": "ohos_fa_corner_radius_default_xs",
             "value": "6.0vp"
         },
+        {
+            "name": "ohos_fa_margin_normal_left",
+            "value": "12.0vp"
+        },
+        {
+            "name": "ohos_fa_margin_normal_top",
+            "value": "12.0vp"
+        },
+        {
+            "name": "ohos_fa_margin_normal_right",
+            "value": "12.0vp"
+        },
+        {
+            "name": "ohos_fa_margin_normal_bottom",
+            "value": "12.0vp"
+        },
+        {
+            "name": "ohos_fa_margin_small_left",
+            "value": "8.0vp"
+        },
+        {
+            "name": "ohos_fa_margin_small_top",
+            "value": "8.0vp"
+        },
+        {
+            "name": "ohos_fa_margin_small_right",
+            "value": "8.0vp"
+        },
+        {
+            "name": "ohos_fa_margin_small_bottom",
+            "value": "8.0vp"
+        },
+        {
+            "name": "ohos_fa_text_size_caption",
+            "value": "10.0vp"
+        },
+        {
+            "name": "ohos_fa_text_size_body",
+            "value": "12.0vp"
+        },
+        {
+            "name": "ohos_fa_text_size_headline",
+            "value": "14.0vp"
+        },
+        {
+            "name": "ohos_fa_text_size_headline_large",
+            "value": "16.0vp"
+        },
+        {
+            "name": "ohos_fa_text_size_huge",
+           "value": "48.0vp"
+        },
         {
             "name": "ohos_id_text_size_headline1",
             "value": "96.0vp"
diff --git a/systemres/main/resources/base/element/id_defined.json b/systemres/main/resources/base/element/id_defined.json
index e52d28aa..3c760092 100644
--- a/systemres/main/resources/base/element/id_defined.json
+++ b/systemres/main/resources/base/element/id_defined.json
@@ -3685,6 +3685,71 @@
             "type": "string",
             "name": "ohos_desc_notification_controller",
             "order": 736
+        },
+        {
+            "type": "float",
+            "name":"ohos_fa_margin_normal_left",
+            "order":737
+        },
+        {
+            "type": "float",
+            "name":"ohos_fa_margin_normal_top",
+            "order":738
+        },
+        {
+            "type": "float",
+            "name":"ohos_fa_margin_normal_right",
+            "order":739
+        },        
+        {
+            "type": "float",
+            "name":"ohos_fa_margin_normal_bottom",
+            "order":740
+        },
+        {
+            "type": "float",
+            "name":"ohos_fa_margin_small_left",
+            "order":741
+        },
+        {
+            "type": "float",
+            "name":"ohos_fa_margin_small_top",
+            "order":742
+        },
+        {
+            "type": "float",
+            "name":"ohos_fa_margin_small_right",
+            "order":743
+        },
+        {
+            "type": "float",
+            "name":"ohos_fa_margin_small_bottom",
+            "order":744
+        },
+        {
+            "type": "float",
+            "name":"ohos_fa_text_size_caption",
+            "order":745
+        },
+        {
+            "type": "float",
+            "name":"ohos_fa_text_size_body",
+            "order":746
+        },
+        {
+            "type": "float",
+            "name":"ohos_fa_text_size_headline",
+            "order":747
+        },
+        {
+            "type": "float",
+            "name":"ohos_fa_text_size_headline_large",
+            "order":748
+        },
+        {
+            "type": "float",
+            "name":"ohos_fa_text_size_huge",
+            "order":749
         }
     ]
 }
\ No newline at end of file
-- 
Gitee