From 214aefa04a18ee2e986ba822e9754471ff3dcbd6 Mon Sep 17 00:00:00 2001 From: khtiana Date: Tue, 26 Oct 2021 09:54:33 +0800 Subject: [PATCH 1/2] support auto margin --- api/config/css/cssConfig.json | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/api/config/css/cssConfig.json b/api/config/css/cssConfig.json index ccd2d2b6cc..e0cc15f01d 100644 --- a/api/config/css/cssConfig.json +++ b/api/config/css/cssConfig.json @@ -1809,7 +1809,7 @@ "name": "margin", "syntax": [ { - "name": "{1,4} || {1,4}" + "name": "{1,4} || {1,4} || {1,4}" } ], "version": [ @@ -1826,7 +1826,8 @@ { "name": [ "length", - "percentage" + "percentage", + "auto" ] } ] @@ -1835,7 +1836,7 @@ "name": "margin-left", "syntax": [ { - "name": " || " + "name": " || || " } ], "version": [ @@ -1852,7 +1853,8 @@ { "name": [ "length", - "percentage" + "percentage", + "auto" ] } ] @@ -1861,7 +1863,7 @@ "name": "margin-top", "syntax": [ { - "name": " || " + "name": " || || " } ], "version": [ @@ -1878,7 +1880,8 @@ { "name": [ "length", - "percentage" + "percentage", + "auto" ] } ] @@ -1887,7 +1890,7 @@ "name": "margin-right", "syntax": [ { - "name": " || " + "name": " || || " } ], "version": [ @@ -1904,7 +1907,8 @@ { "name": [ "length", - "percentage" + "percentage", + "auto" ] } ] @@ -1913,7 +1917,7 @@ "name": "margin-bottom", "syntax": [ { - "name": " || " + "name": " || || " } ], "version": [ @@ -1930,7 +1934,8 @@ { "name": [ "length", - "percentage" + "percentage", + "auto" ] } ] -- Gitee From 41b3de50a67264da9dbb4ea0e106a8fd0dd77216 Mon Sep 17 00:00:00 2001 From: khtiana Date: Tue, 26 Oct 2021 10:41:33 +0800 Subject: [PATCH 2/2] support auto margin --- api/config/css/cssConfig.json | 45 +++++++++++++++++++++++++++-------- 1 file changed, 35 insertions(+), 10 deletions(-) diff --git a/api/config/css/cssConfig.json b/api/config/css/cssConfig.json index e0cc15f01d..46ae119285 100644 --- a/api/config/css/cssConfig.json +++ b/api/config/css/cssConfig.json @@ -1809,7 +1809,12 @@ "name": "margin", "syntax": [ { - "name": "{1,4} || {1,4} || {1,4}" + "name": "{1,4} || {1,4} || auto{1,4}" + } + ], + "values": [ + { + "name": "auto" } ], "version": [ @@ -1827,7 +1832,7 @@ "name": [ "length", "percentage", - "auto" + "enum" ] } ] @@ -1836,7 +1841,12 @@ "name": "margin-left", "syntax": [ { - "name": " || || " + "name": " || || auto" + } + ], + "values": [ + { + "name": "auto" } ], "version": [ @@ -1854,7 +1864,7 @@ "name": [ "length", "percentage", - "auto" + "enum" ] } ] @@ -1863,7 +1873,12 @@ "name": "margin-top", "syntax": [ { - "name": " || || " + "name": " || || auto" + } + ], + "values": [ + { + "name": "auto" } ], "version": [ @@ -1881,7 +1896,7 @@ "name": [ "length", "percentage", - "auto" + "enum" ] } ] @@ -1890,7 +1905,12 @@ "name": "margin-right", "syntax": [ { - "name": " || || " + "name": " || || auto" + } + ], + "values": [ + { + "name": "auto" } ], "version": [ @@ -1908,7 +1928,7 @@ "name": [ "length", "percentage", - "auto" + "enum" ] } ] @@ -1917,7 +1937,12 @@ "name": "margin-bottom", "syntax": [ { - "name": " || || " + "name": " || || auto" + } + ], + "values": [ + { + "name": "auto" } ], "version": [ @@ -1935,7 +1960,7 @@ "name": [ "length", "percentage", - "auto" + "enum" ] } ] -- Gitee