[tor-commits] [donate-static/master] Merge remote-tracking branch 'gitlab/kez-donate-form-pages' into staging

[kez@xxxxxxxxxxxxxx]

commit 3fc3ea26a065792644e8a443ce617e19817757fc
Merge: 14ccb84a e11a0007
Author: gus <gus@xxxxxxxxxxxxxx>
Date:   Mon Jun 28 17:07:57 2021 -0300

    Merge remote-tracking branch 'gitlab/kez-donate-form-pages' into staging

 content/champions-of-privacy/contents.lr |  4 +--
 content/contents.lr                      |  4 +--
 content/cryptocurrency/contents.lr       |  5 +---
 content/donate-thank-you/contents.lr     |  4 +--
 content/donor-faq/contents.lr            |  4 +--
 content/monthly-giving/contents.lr       |  4 +--
 content/privacy-policy/contents.lr       |  4 +--
 content/state-disclosures/contents.lr    |  4 +--
 models/donate-form.ini                   |  6 +----
 models/donate-page.ini                   |  4 ---
 templates/donate-empty.html              |  3 ++-
 templates/donate-form.html               |  3 +++
 templates/homepage.html                  |  1 +
 templates/layout.html                    | 10 +++-----
 templates/meta.html                      | 43 ++++++++++++++++----------------
 templates/page.html                      |  2 +-
 16 files changed, 41 insertions(+), 64 deletions(-)

diff --cc templates/donate-form.html
index 7c95ab30,e2f8bd67..cfacc90d
--- a/templates/donate-form.html
+++ b/templates/donate-form.html
@@@ -196,9 -197,6 +198,10 @@@
        }
      );
    }
 -</script>
 +
 +  if ((window.location.protocol == "https:") || (`{{ envvars('ENV') }}` == 'dev')) {
 +    window.reactComponents[0].props.paymentMethods.push('credit-card');
 +  }
 +  </script>
    <script type="text/javascript" src="{{ '/static/gen/donate.js' | asseturl }}"></script>
+ {% endblock %}



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits