Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update Ticket Section #87

Open
wants to merge 4 commits into
base: development
Choose a base branch
from
Open

update Ticket Section #87

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
91dc532
update Ticket Row
IHackPy Nov 7, 2017
b4ed908
ticket view
IHackPy Nov 12, 2017
1b84091
..
IHackPy Nov 13, 2017
0d5265d
..
IHackPy Nov 13, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 24 additions & 0 deletions cauth/migrations/0006_auto_20171113_1703.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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'),
),
]
4 changes: 2 additions & 2 deletions pyconpune/staticfiles/css/tickets/ticket.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -59,7 +59,7 @@
min-height: 12em;
}
.ticket-row {
margin-top: 3em;
margin-top: 2em;
}
.ticket-disabled {
opacity: 0.1;
Expand Down
2 changes: 1 addition & 1 deletion pyconpune/templates/ticket/select_ticket.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{% for ticket in tickets %}
<div id="ticket-row-1-{{ forloop.counter }}" class="p-ticket ticket col-xl-4 col-lg-4 col-md-12 mb-5 mb-xl-2 mb-lg-2">
<div class="ticket-outer">
<div class="ticket-inner text-center" style="padding: 3em">
<div class="ticket-inner text-center" style="padding: 2em">
<figure>
<!-- {{ ticket.image_base64_title }} icon by Icons8 -->
<img class="icon icons8-{{ ticket.image_base64_title }}" width="100" height="100" src="{{ ticket.image_base64_text }}">
Expand Down