Merge last couple of months of work (#45)

* Load webpack only in debug.

* Clean up.

* Pin versions because problems

* Add licence. (#40)

* Disable form until valid. (#42)

* Allow input height to be greater than 24px. (#41)

* Add youth payment type. (#43)
This commit is contained in:
Drew Larson
2017-05-17 20:17:26 -06:00
committed by GitHub
parent 668c9485d0
commit 6764c289ff
9 changed files with 68 additions and 42 deletions
@@ -0,0 +1,20 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.10.4 on 2017-05-02 01:20
from __future__ import unicode_literals
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('core', '0003_auto_20170219_1741'),
]
operations = [
migrations.AlterField(
model_name='payment',
name='type',
field=models.CharField(choices=[('NONE', 'None'), ('CASH', 'Cash'), ('CHEQUE', 'Cheque'), ('VOLUNTEERING', 'Volunteering'), ('SQUARE', 'Square'), ('PAYPAL', 'PayPal'), ('YOUTH', 'Youth'), ('UNKNOWN', 'Unknown')], default='NONE', max_length=12),
),
]
+1
View File
@@ -40,6 +40,7 @@ class Payment(models.Model):
('VOLUNTEERING', 'Volunteering'),
('SQUARE', 'Square'),
('PAYPAL', 'PayPal'),
('YOUTH', 'Youth'),
('UNKNOWN', 'Unknown')
)
type = models.CharField(max_length=12, choices=payment_choices, default='NONE')
@@ -372,4 +372,11 @@ span.mdl-textfield__error, span.error {
html [type="button"] {
-webkit-appearance: initial !important;
}
}
#member-form {
.mdl-checkbox {
height: auto;
min-height: 24px;
}
}