Merge remote-tracking branch 'origin' into jls/move-webforms-css

dimagi · Jan 30, 2024 · 3990d11 · 3990d11
2 parents 2174798 + 70c3cf3
commit 3990d11
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 1 deletion.
diff --git a/corehq/apps/domain/urls.py b/corehq/apps/domain/urls.py
@@ -76,6 +76,7 @@
     RecoveryMeasuresHistory,
 )
 from corehq.apps.domain.views.sms import SMSRatesView
+from corehq.apps.hqwebapp.decorators import waf_allow
 from corehq.apps.integration.urls import settings_patterns as integration_settings
 from corehq.apps.linked_domain.views import DomainLinkView
 from corehq.apps.reports.dispatcher import DomainReportDispatcher
@@ -136,7 +137,8 @@
 domain_settings = [
     url(r'^$', DefaultProjectSettingsView.as_view(), name=DefaultProjectSettingsView.urlname),
     url(r'^my_settings/$', EditMyProjectSettingsView.as_view(), name=EditMyProjectSettingsView.urlname),
-    url(r'^basic/$', EditBasicProjectInfoView.as_view(), name=EditBasicProjectInfoView.urlname),
+    url(r'^basic/$',
+        waf_allow('XSS_BODY')(EditBasicProjectInfoView.as_view()), name=EditBasicProjectInfoView.urlname),
     url(r'^call_center_owner_options/', CallCenterOwnerOptionsView.as_view(),
         name=CallCenterOwnerOptionsView.url_name),
     url(r'^privacy/$', EditPrivacySecurityView.as_view(), name=EditPrivacySecurityView.urlname),

diff --git a/corehq/apps/hqwebapp/static/cloudcare/less/formplayer-common/webforms.less b/corehq/apps/hqwebapp/static/cloudcare/less/formplayer-common/webforms.less
@@ -85,6 +85,30 @@ input:invalid {
   isolation: isolate;
 }
 
+.widget button p {
+  margin-bottom: 0;
+}
+
+.widget button h1 {
+  margin-top: 7px;
+  margin-bottom: 5px;
+}
+
+.widget button h2 {
+  margin-top: 6.5px;
+  margin-bottom: 4.5px;
+}
+
+.widget button h3 {
+  margin-top: 6px;
+  margin-bottom: 4px;
+}
+
+.widget button h4 {
+  margin-top: 5.5px;
+  margin-bottom: 3.5px;
+}
+
 .coordinate {
   font-weight: bold;
   width: 8em;