diff --git a/cauth/migrations/0006_auto_20171113_1703.py b/cauth/migrations/0006_auto_20171113_1703.py new file mode 100644 index 0000000..2260e5f --- /dev/null +++ b/cauth/migrations/0006_auto_20171113_1703.py @@ -0,0 +1,24 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('cauth', '0005_auto_20171010_1534'), + ] + + operations = [ + migrations.AlterField( + model_name='userprofile', + name='age_group', + field=models.CharField(max_length=255, choices=[('1', 'Less than 10'), ('2', '11-17'), ('3', '18-24'), ('4', '25-34'), ('5', '35-44'), ('6', '45 and over')], verbose_name='age group'), + ), + migrations.AlterField( + model_name='userprofile', + name='tshirt_size', + field=models.CharField(max_length=255, choices=[('MXS', 'Male: Xtra Small'), ('MS', 'Male: Small'), ('MM', 'Male: Medium'), ('ML', 'Male: Large'), ('MXL', 'Male: Xtra Large'), ('MXXL', 'Male: Double Xtra Large'), ('FXS', 'Female: Xtra Small'), ('FS', 'Female: Small'), ('FM', 'Female: Medium'), ('FL', 'Female: Large'), ('FXL', 'Female: Xtra Large'), ('FXXL', 'Female: Double Xtra Large')], verbose_name='tshirt size'), + ), + ] diff --git a/pyconpune/staticfiles/css/tickets/ticket.css b/pyconpune/staticfiles/css/tickets/ticket.css index ada1596..101bd70 100644 --- a/pyconpune/staticfiles/css/tickets/ticket.css +++ b/pyconpune/staticfiles/css/tickets/ticket.css @@ -48,7 +48,7 @@ font-size: 2.5rem; } #ticket-row-1 .ticket-title { - min-height: 5em; + min-height: 3em; } .price, .tax-price, .total-price { text-align: right; @@ -59,7 +59,7 @@ min-height: 12em; } .ticket-row { - margin-top: 3em; + margin-top: 2em; } .ticket-disabled { opacity: 0.1; diff --git a/pyconpune/templates/ticket/select_ticket.html b/pyconpune/templates/ticket/select_ticket.html index 72e1484..6346a45 100644 --- a/pyconpune/templates/ticket/select_ticket.html +++ b/pyconpune/templates/ticket/select_ticket.html @@ -1,7 +1,7 @@ {% for ticket in tickets %}
-
+