diff --git a/corehq/apps/cloudcare/static/cloudcare/js/form_entry/form_ui.js b/corehq/apps/cloudcare/static/cloudcare/js/form_entry/form_ui.js index 277da5be3ba2..e3659c3476c4 100644 --- a/corehq/apps/cloudcare/static/cloudcare/js/form_entry/form_ui.js +++ b/corehq/apps/cloudcare/static/cloudcare/js/form_entry/form_ui.js @@ -410,8 +410,6 @@ hqDefine("cloudcare/js/form_entry/form_ui", [ self.hasSubmitAttempted = ko.observable(false); self.isSubmitting = ko.observable(false); self.isAnchoredSubmitStyle = toggles.toggleEnabled('WEB_APPS_ANCHORED_SUBMIT'); - self.submitClass = constants.FULL_WIDTH + ' text-center' + - (self.isAnchoredSubmitStyle ? ' anchored-submit' : ' nonanchored-submit'); self.currentIndex = ko.observable("0"); self.atLastIndex = ko.observable(false); diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap3/form.html b/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap3/form.html index 55d5e1194fbf..de78caaff210 100644 --- a/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap3/form.html +++ b/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/bootstrap3/form.html @@ -42,20 +42,18 @@

{% endif %} -
-
+
+
{% endif %} -
{# todo B5: css:form-group #} -
+
+
{% endif %} --
-+
{# todo B5: css:form-group #} - {% endif %} {% endif %} diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/formplayer-webapp_form.formplayer-webapp_form.style.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/formplayer-webapp_form.formplayer-webapp_form.style.diff.txt index e69de29bb2d1..fadfc3e1e96d 100644 --- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/formplayer-webapp_form.formplayer-webapp_form.style.diff.txt +++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/formplayer-webapp_form.formplayer-webapp_form.style.diff.txt @@ -0,0 +1,11 @@ +--- ++++ +@@ -28,7 +28,7 @@ + margin-right: -@form-text-indent; + } + +- background-color: @call-to-action-extra-hi; ++ background-color: var(--bsprimary-bg-subtle); + .border-bottom-radius(0); + + .submit .btn { diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/imports/includes_variables._variables.style.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/imports/includes_variables._variables.style.diff.txt index c055fae6b61d..3064370f6abc 100644 --- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/imports/includes_variables._variables.style.diff.txt +++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/imports/includes_variables._variables.style.diff.txt @@ -1,6 +1,6 @@ --- +++ -@@ -1,124 +1,225 @@ +@@ -1,123 +1,225 @@ -@import "@{b3-import-variables}"; - -// Nunito Sans is used on dimagi.com and embedded in hqwebapp/base.html @@ -198,7 +198,6 @@ -@zindex-formplayer-progress: 990; -@zindex-cloudcare-debugger: 1005; -@zindex-formplayer-scroll-to-bottom: 5; --@zindex-formplayer-anchored-submit: 2; - - -@input-border-radius-large: 5px; diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/imports/includes_variables._variables_bootstrap3.style.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/imports/includes_variables._variables_bootstrap3.style.diff.txt index 107820298537..d3622bbee4d0 100644 --- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/imports/includes_variables._variables_bootstrap3.style.diff.txt +++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/imports/includes_variables._variables_bootstrap3.style.diff.txt @@ -1,6 +1,6 @@ --- +++ -@@ -1,124 +1,70 @@ +@@ -1,123 +1,69 @@ -@import "@{b3-import-variables}"; +/* +These are Boostrap 3 variables that were carried over in the @@ -161,7 +161,6 @@ -@zindex-formplayer-progress: 990; -@zindex-cloudcare-debugger: 1005; -@zindex-formplayer-scroll-to-bottom: 5; --@zindex-formplayer-anchored-submit: 2; +$zindex-navbar: 1000; +$zindex-report-loading: 100; +$zindex-app-preview: 998; @@ -170,7 +169,6 @@ +$zindex-formplayer-progress: 990; +$zindex-cloudcare-debugger: 1005; +$zindex-formplayer-scroll-to-bottom: 5; -+$zindex-formplayer-anchored-submit: 2; +$zindex-select2-results: 1056; // higher than $zindex-modal so select2s can be used in modals -