From e8a17193b19944688c775e5b123d113ce30dcb84 Mon Sep 17 00:00:00 2001
From: Jennifer Schweers <orange.jenny@gmail.com>
Date: Mon, 29 Jan 2024 12:49:01 -0500
Subject: [PATCH] Moved webforms.css into formplayer-common LESS

---
 .../apps/cloudcare/templates/cloudcare/formplayer_home.html   | 1 -
 corehq/apps/cloudcare/templates/formplayer-common/base.html   | 4 ----
 .../static/cloudcare/less/formplayer-common-main.less         | 1 +
 .../webforms.css => less/formplayer-common/webforms.less}     | 0
 .../templates/integration/base_cloudcare_template.html        | 1 -
 5 files changed, 1 insertion(+), 6 deletions(-)
 rename corehq/apps/hqwebapp/static/cloudcare/{css/webforms.css => less/formplayer-common/webforms.less} (100%)

diff --git a/corehq/apps/cloudcare/templates/cloudcare/formplayer_home.html b/corehq/apps/cloudcare/templates/cloudcare/formplayer_home.html
index 08cdcd3f60d1..b1dfd6c7f77e 100644
--- a/corehq/apps/cloudcare/templates/cloudcare/formplayer_home.html
+++ b/corehq/apps/cloudcare/templates/cloudcare/formplayer_home.html
@@ -34,7 +34,6 @@
   {% compress css %}
     <link rel="stylesheet" href="{% static 'nprogress/nprogress.css' %}">
     <link rel="stylesheet" href="{% static 'At.js/dist/css/jquery.atwho.min.css' %}">
-    <link rel="stylesheet" href="{% static 'cloudcare/css/webforms.css' %}">
     <link rel="stylesheet" href="{% static 'bootstrap-switch/dist/css/bootstrap3/bootstrap-switch.css' %}"/>
   {% endcompress %}
   {% compress css %}
diff --git a/corehq/apps/cloudcare/templates/formplayer-common/base.html b/corehq/apps/cloudcare/templates/formplayer-common/base.html
index a0b00144ec25..cd52a7bd25e5 100644
--- a/corehq/apps/cloudcare/templates/formplayer-common/base.html
+++ b/corehq/apps/cloudcare/templates/formplayer-common/base.html
@@ -15,10 +15,6 @@
           rel="stylesheet"
           media="all"
           href="{% static 'cloudcare/less/font-formplayer.less' %}" />
-    <link type="text/css"
-          rel="stylesheet"
-          media="all"
-          href="{% static 'cloudcare/css/webforms.css' %}">
     <link type="text/less"
           rel="stylesheet"
           media="all"
diff --git a/corehq/apps/hqwebapp/static/cloudcare/less/formplayer-common-main.less b/corehq/apps/hqwebapp/static/cloudcare/less/formplayer-common-main.less
index 75fd091e7ee1..8cdfa45726ca 100644
--- a/corehq/apps/hqwebapp/static/cloudcare/less/formplayer-common-main.less
+++ b/corehq/apps/hqwebapp/static/cloudcare/less/formplayer-common-main.less
@@ -22,5 +22,6 @@ version of FORMPLAYER
 @import "formplayer-common/formnav";
 @import "formplayer-common/markdown-table";
 @import "formplayer-common/address";
+@import "formplayer-common/webforms";
 
 @import "debugger/debugger";
diff --git a/corehq/apps/hqwebapp/static/cloudcare/css/webforms.css b/corehq/apps/hqwebapp/static/cloudcare/less/formplayer-common/webforms.less
similarity index 100%
rename from corehq/apps/hqwebapp/static/cloudcare/css/webforms.css
rename to corehq/apps/hqwebapp/static/cloudcare/less/formplayer-common/webforms.less
diff --git a/corehq/apps/integration/templates/integration/base_cloudcare_template.html b/corehq/apps/integration/templates/integration/base_cloudcare_template.html
index ec90dd054030..6d400cd4a2fd 100644
--- a/corehq/apps/integration/templates/integration/base_cloudcare_template.html
+++ b/corehq/apps/integration/templates/integration/base_cloudcare_template.html
@@ -17,7 +17,6 @@
 
 {% block stylesheets %}
   {% compress css %}
-    <link rel="stylesheet" href="{% static 'cloudcare/css/webforms.css' %}">
     <link rel="stylesheet" href="{% static 'bootstrap-switch/dist/css/bootstrap3/bootstrap-switch.css' %}"/>
   {% endcompress %}
   {% compress css %}