From e4d6d1a3ad20be0e396a4e52618faa6ce6477dce Mon Sep 17 00:00:00 2001 From: Antonio Ortega <60252917@liferay.com> Date: Wed, 19 Jul 2023 21:45:30 +0200 Subject: [PATCH] fix(theme-tasks): consider the case then border-radius value might be a variable --- .../packages/liferay-theme-tasks/lib/r2/liferay-r2/index.js | 4 ++++ .../packages/liferay-theme-tasks/lib/r2/liferay-r2/index.js | 4 ++++ .../packages/liferay-theme-tasks/lib/r2/liferay-r2/index.js | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/maintenance/projects/js-themes-toolkit-v10-x/packages/liferay-theme-tasks/lib/r2/liferay-r2/index.js b/maintenance/projects/js-themes-toolkit-v10-x/packages/liferay-theme-tasks/lib/r2/liferay-r2/index.js index f7f190efd0..e3acca36d5 100644 --- a/maintenance/projects/js-themes-toolkit-v10-x/packages/liferay-theme-tasks/lib/r2/liferay-r2/index.js +++ b/maintenance/projects/js-themes-toolkit-v10-x/packages/liferay-theme-tasks/lib/r2/liferay-r2/index.js @@ -23,6 +23,10 @@ function quad(v, m) { } function quad_radius(v) { + if (v.startsWith('var')) { + return v; + } + var m = v.trim().split(/\s+/); // 1px 2px 3px 4px => 1px 2px 4px 3px diff --git a/maintenance/projects/js-themes-toolkit-v9-x/packages/liferay-theme-tasks/lib/r2/liferay-r2/index.js b/maintenance/projects/js-themes-toolkit-v9-x/packages/liferay-theme-tasks/lib/r2/liferay-r2/index.js index 9aae0a42cc..abe316872b 100644 --- a/maintenance/projects/js-themes-toolkit-v9-x/packages/liferay-theme-tasks/lib/r2/liferay-r2/index.js +++ b/maintenance/projects/js-themes-toolkit-v9-x/packages/liferay-theme-tasks/lib/r2/liferay-r2/index.js @@ -23,6 +23,10 @@ function quad(v, m) { } function quad_radius(v) { + if (v.startsWith('var')) { + return v; + } + var m = v.trim().split(/\s+/); // 1px 2px 3px 4px => 1px 2px 4px 3px diff --git a/projects/js-themes-toolkit/packages/liferay-theme-tasks/lib/r2/liferay-r2/index.js b/projects/js-themes-toolkit/packages/liferay-theme-tasks/lib/r2/liferay-r2/index.js index f7f190efd0..e3acca36d5 100644 --- a/projects/js-themes-toolkit/packages/liferay-theme-tasks/lib/r2/liferay-r2/index.js +++ b/projects/js-themes-toolkit/packages/liferay-theme-tasks/lib/r2/liferay-r2/index.js @@ -23,6 +23,10 @@ function quad(v, m) { } function quad_radius(v) { + if (v.startsWith('var')) { + return v; + } + var m = v.trim().split(/\s+/); // 1px 2px 3px 4px => 1px 2px 4px 3px