commit 14bb13ed05b7b86d0e3296e18633ed15e895a350 Merge: a347b5d3 71e5f6e7 Author: hiro hiro@torproject.org Date: Tue Oct 20 15:21:13 2020 +0200
Merge branch 'staging'
assets/static/gen/donate.js | 4 +-- assets/static/gen/donate.js.map | 2 +- .../donate/champions-of-privacy-white-full.png | Bin 0 -> 228759 bytes .../images/donate/champions-of-privacy-white.png | Bin 228759 -> 26291 bytes .../donate/defenders-of-privacy-white-full.png | Bin 0 -> 214940 bytes .../images/donate/defenders-of-privacy-white.png | Bin 214940 -> 25205 bytes content/champions-of-privacy/contents.lr | 23 +++++++++++---- content/monthly-giving/contents.lr | 4 +-- content/privacy-policy/contents.lr | 26 +++++++++++++++++ databags/menu_footer.ini | 8 +++++- models/donate-form.ini | 5 ++++ parcel/js/giving_form.jsx | 32 ++++++++++++--------- parcel/js/price_buttons.jsx | 3 +- templates/donate-form.html | 1 + templates/footer.html | 6 ---- templates/meta.html | 2 +- templates/navbar-min.html | 5 +++- templates/navbar.html | 5 +++- 18 files changed, 91 insertions(+), 35 deletions(-)