From bf94b789d67ab4a57f62c11da3b1ba5be7be7f5a Mon Sep 17 00:00:00 2001 From: Joel Addison Date: Sun, 5 Jan 2020 12:10:42 +1000 Subject: [PATCH] Update button styles Replace Bootstrap 3 button default style with Bootstrap 4 equivalent. --- pinaxcon/templates/_form_btns.html | 2 +- pinaxcon/templates/registrasion/checkout_errors.html | 2 +- pinaxcon/templates/registrasion/manual_payment.html | 2 +- pinaxcon/templates/registrasion/review.html | 4 ++-- pinaxcon/templates/registrasion/voucher_code.html | 2 +- pinaxcon/templates/symposion/proposals/proposal_cancel.html | 2 +- pinaxcon/templates/symposion/proposals/proposal_detail.html | 4 ++-- pinaxcon/templates/symposion/proposals/proposal_edit.html | 2 +- .../templates/symposion/proposals/proposal_submit_kind.html | 2 +- pinaxcon/templates/symposion/reviews/review_detail.html | 2 +- pinaxcon/templates/symposion/sponsorship/add.html | 2 +- pinaxcon/templates/symposion/sponsorship/apply.html | 2 +- pinaxcon/templates/symposion/sponsorship/detail.html | 2 +- pinaxcon/templates/symposion/teams/team_detail.html | 2 +- 14 files changed, 16 insertions(+), 16 deletions(-) diff --git a/pinaxcon/templates/_form_btns.html b/pinaxcon/templates/_form_btns.html index 00a0ca25..4492c282 100644 --- a/pinaxcon/templates/_form_btns.html +++ b/pinaxcon/templates/_form_btns.html @@ -1,2 +1,2 @@ -Cancel \ No newline at end of file +Cancel diff --git a/pinaxcon/templates/registrasion/checkout_errors.html b/pinaxcon/templates/registrasion/checkout_errors.html index 7993fd8b..3af7feca 100644 --- a/pinaxcon/templates/registrasion/checkout_errors.html +++ b/pinaxcon/templates/registrasion/checkout_errors.html @@ -18,7 +18,7 @@
Try fixing these errors - Return to dashboard + Return to dashboard
{% endblock %} diff --git a/pinaxcon/templates/registrasion/manual_payment.html b/pinaxcon/templates/registrasion/manual_payment.html index fcb44348..1b585f18 100644 --- a/pinaxcon/templates/registrasion/manual_payment.html +++ b/pinaxcon/templates/registrasion/manual_payment.html @@ -23,7 +23,7 @@
- Return to invoice + Return to invoice
diff --git a/pinaxcon/templates/registrasion/review.html b/pinaxcon/templates/registrasion/review.html index b6d92cbf..7a78c350 100644 --- a/pinaxcon/templates/registrasion/review.html +++ b/pinaxcon/templates/registrasion/review.html @@ -75,14 +75,14 @@ Check out and pay - Return to dashboard + Return to dashboard {% else %}

You have no items that need to be paid.

- Return to dashboard + Return to dashboard
{% endif %} diff --git a/pinaxcon/templates/registrasion/voucher_code.html b/pinaxcon/templates/registrasion/voucher_code.html index 34703046..b102bda4 100644 --- a/pinaxcon/templates/registrasion/voucher_code.html +++ b/pinaxcon/templates/registrasion/voucher_code.html @@ -15,7 +15,7 @@ diff --git a/pinaxcon/templates/symposion/proposals/proposal_cancel.html b/pinaxcon/templates/symposion/proposals/proposal_cancel.html index 834055d1..fb9a7502 100644 --- a/pinaxcon/templates/symposion/proposals/proposal_cancel.html +++ b/pinaxcon/templates/symposion/proposals/proposal_cancel.html @@ -10,6 +10,6 @@ {% csrf_token %}

Are you sure you want to cancel {{ proposal.title }}?

- {% trans 'No, keep it for now' %} + {% trans 'No, keep it for now' %} {% endblock %} diff --git a/pinaxcon/templates/symposion/proposals/proposal_detail.html b/pinaxcon/templates/symposion/proposals/proposal_detail.html index ebd0b597..a5fd7a24 100644 --- a/pinaxcon/templates/symposion/proposals/proposal_detail.html +++ b/pinaxcon/templates/symposion/proposals/proposal_detail.html @@ -22,7 +22,7 @@ Manage Additional Speakers {% trans "Cancel this proposal" %} {% else %} - {% trans "Remove me from this proposal" %} + {% trans "Remove me from this proposal" %} {% endif %} {% else %} {% trans 'Cancelled' %} @@ -61,7 +61,7 @@

{% trans 'Conversation with Reviewers' %}

- + {% for message in proposal.messages.all %}
diff --git a/pinaxcon/templates/symposion/proposals/proposal_edit.html b/pinaxcon/templates/symposion/proposals/proposal_edit.html index 4a6c5dac..5d026219 100644 --- a/pinaxcon/templates/symposion/proposals/proposal_edit.html +++ b/pinaxcon/templates/symposion/proposals/proposal_edit.html @@ -11,7 +11,7 @@
{% include "_form_snippet.html" with form=form %} - Cancel + Cancel
diff --git a/pinaxcon/templates/symposion/proposals/proposal_submit_kind.html b/pinaxcon/templates/symposion/proposals/proposal_submit_kind.html index 030b8e54..4946b888 100644 --- a/pinaxcon/templates/symposion/proposals/proposal_submit_kind.html +++ b/pinaxcon/templates/symposion/proposals/proposal_submit_kind.html @@ -14,7 +14,7 @@ You will be able to edit your proposal after it has been submitted. The program committee may ask questions, provide feedback, and even suggest changes to your proposal as part of the review processes.

- + {% endblock %} diff --git a/pinaxcon/templates/symposion/reviews/review_detail.html b/pinaxcon/templates/symposion/reviews/review_detail.html index c067ac87..dcae813b 100644 --- a/pinaxcon/templates/symposion/reviews/review_detail.html +++ b/pinaxcon/templates/symposion/reviews/review_detail.html @@ -26,7 +26,7 @@ {% else %} {% if proposal.result.status == "standby" %} diff --git a/pinaxcon/templates/symposion/sponsorship/add.html b/pinaxcon/templates/symposion/sponsorship/add.html index 9bc23727..bbba5c7d 100644 --- a/pinaxcon/templates/symposion/sponsorship/add.html +++ b/pinaxcon/templates/symposion/sponsorship/add.html @@ -18,7 +18,7 @@
diff --git a/pinaxcon/templates/symposion/sponsorship/apply.html b/pinaxcon/templates/symposion/sponsorship/apply.html index 592d2448..26778380 100644 --- a/pinaxcon/templates/symposion/sponsorship/apply.html +++ b/pinaxcon/templates/symposion/sponsorship/apply.html @@ -22,7 +22,7 @@ {{ form|bootstrap_horizontal }}
- Cancel + Cancel

By submitting this sponsor application you are agreeing to the {% comment %} diff --git a/pinaxcon/templates/symposion/sponsorship/detail.html b/pinaxcon/templates/symposion/sponsorship/detail.html index da19741c..37efe4b1 100644 --- a/pinaxcon/templates/symposion/sponsorship/detail.html +++ b/pinaxcon/templates/symposion/sponsorship/detail.html @@ -33,7 +33,7 @@

diff --git a/pinaxcon/templates/symposion/teams/team_detail.html b/pinaxcon/templates/symposion/teams/team_detail.html index 994b7a80..802d4481 100644 --- a/pinaxcon/templates/symposion/teams/team_detail.html +++ b/pinaxcon/templates/symposion/teams/team_detail.html @@ -16,7 +16,7 @@ {% if can_leave %}
{% csrf_token %} - +
{% endif %}