Skip to content

Commit 6dbaa29

Browse files
yychenyychen
authored
Merge pull request pycontw#694 from yuhow/master
Punctuation Marks & Table Fix
2 parents a698866 + 4f68810 commit 6dbaa29

File tree

4 files changed

+193
-122
lines changed

4 files changed

+193
-122
lines changed

‎src/static/pycontw-2020/styles/page.scss

+31
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,37 @@ main {
132132
margin-top: 0;
133133
}
134134
}
135+
136+
// Different styles:
137+
&.square {
138+
$mark-indent: 0.8rem;
139+
$text-indent: 2.125rem;
140+
141+
padding-left: $text-indent;
142+
text-indent: $mark-indent - $text-indent;
143+
144+
> li {
145+
&::before {
146+
content: '▪';
147+
width: $text-indent - $mark-indent;
148+
}
149+
}
150+
}
151+
152+
&.white-circle {
153+
$mark-indent: 0.6rem;
154+
$text-indent: 2.125rem;
155+
156+
padding-left: $text-indent;
157+
text-indent: $mark-indent - $text-indent;
158+
159+
> li {
160+
&::before {
161+
content: '◦';
162+
width: $text-indent - $mark-indent;
163+
}
164+
}
165+
}
135166
}
136167

137168
> table:not([class]), table.table, .table > table {

‎src/static/pycontw-2020/styles/pages/_sponsorship-prospectus.scss

+32
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,36 @@
66
width: 130%;
77
word-wrap: break-word;
88
position: relative;
9+
border-spacing: 0;
10+
border-collapse: collapse;
11+
12+
th, td {
13+
text-indent: 0;
14+
text-align: left;
15+
16+
line-height: 1.2;
17+
padding-top: 10px;
18+
vertical-align: top;
19+
20+
border-top: 1px solid #999;
21+
padding: 10px 5px;
22+
}
23+
24+
th {
25+
font-weight: 500;
26+
}
27+
28+
tbody {
29+
tr:first-child {
30+
td, th {
31+
border-top: 2px solid #999;
32+
}
33+
}
34+
}
35+
36+
thead {
37+
th {
38+
border-top: none;
39+
}
40+
}
941
}

‎src/templates/pycontw-2020/contents/en/sponsor/prospectus.html

+68-64
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
{% load i18n %}
44

5-
{% block body_class %}scroll-x{% endblock %}
65
{% block title %}Sponsor{% endblock title %}
6+
{% block body_class %}scroll-x{% endblock %}
77
{% block content %}
88

99
<section class="pill-title">
@@ -33,7 +33,7 @@ <h1>Sponsorship Prospectus</h1>
3333
PyCon Taiwan continues to connect with new community members locally, nationally, and globally.
3434
Your sponsorship helps keep PyCon Taiwan affordable and accessible to the widest possible audience. Because of your support, we were able to provide some attendees with financial aid.
3535
<br>
36-
We want to hear from you! Contact us anytime - we are flexible and willing to build a sponsorship package that fits your needs. Only you know your business, how you measure success and what you’re looking for.
36+
We want to hear from you! Contact us anytime - we are flexible and willing to build a sponsorship package that fits your needs. Only you know your business, how you measure success and what you're looking for.
3737
</p>
3838
<ul>
3939
<li>Diamond Level Sponsorship</li>
@@ -44,22 +44,22 @@ <h1>Sponsorship Prospectus</h1>
4444
<li>Special and Customized Sponsorship</li>
4545
</ul>
4646
<p>
47-
<b>Estimated attendance: 400+</b> （First PyCon Taiwan in southern Taiwan!）
47+
<b>Estimated attendance: 400+</b> (First PyCon Taiwan in southern Taiwan!)
4848
</p>
4949
<p>
5050
<b>Quick stats from 2019:</b>
5151
<ul>
5252
<li>675 attendees</li>
53-
<li>Of those 675 attendees，20% were from 9+ different countries out of Taiwan.</li>
53+
<li>Of those 675 attendees, 20% were from 9+ different countries out of Taiwan.</li>
5454
<li>Most attendees are soft engineers. The other audience profile are: developers, potential job seekers, data scientist, students, managers, researchers, consultants, CEOs and CTOs etc.</li>
5555
<li>Around 30% attendees have been using Python for more than 5 years.</li>
5656
</ul>
5757
</p>
5858
<p>
5959
<b>Conference Schedule</b>
6060
<ul>
61-
<li>Call for Proposal: March 1st, 2020</li>
62-
<li>Deadline of Call for Proposal: April 26th, 2020 (23:59:59 <a href="https://www.timeanddate.com/worldclock/converter.html?iso=20200427T115900&p1=tz_aoe&p2=241&p3=1440">AoE</a>)</li>
61+
<li>Call for Proposal: March 1st, 2020</li>
62+
<li>Deadline of Call for Proposal: April 26th, 2020 (23:59:59 <a href="https://www.timeanddate.com/worldclock/converter.html?iso=20200427T115900&p1=tz_aoe&p2=241&p3=1440">AoE</a>)</li>
6363
<li>Schedule Announcement: middle of June, 2020 (TBD)</li>
6464
<li>Job Fair: September 5th, 2020 (TBD)</li>
6565
<li>Main Conference: September 5-6th, 2020</li>
@@ -173,70 +173,74 @@ <h1>Sponsorship Prospectus</h1>
173173
<br>
174174
<br>
175175
<table class="table-sponsorship-prospectus">
176-
<tr>
177-
<td></td>
178-
<td>Diamond</td>
179-
<td>Platinum</td>
180-
<td>Golden</td>
181-
<td>Silver</td>
182-
<td>Bronze</td>
183-
</tr>
184-
<tr>
185-
<td>Speaker Banquets / Person</td>
186-
<td>200</td>
187-
<td>200</td>
188-
<td>200</td>
189-
<td>200</td>
190-
<td>200</td>
191-
</tr>
192-
<tr>
193-
<td>Luxury Booth (Limit: 2)</td>
194-
<td>Included</td>
195-
<td>Included</td>
196-
<td>Included</td>
197-
<td>1,300</td>
198-
<td>-</td>
199-
</tr>
200-
<tr>
201-
<td>Talks (30 Mins.)<br><font size="-1">(Limit: 1 Per Community Track)</font></td>
202-
<td>Included</td>
203-
<td>Included</td>
204-
<td>500</td>
205-
<td>-</td>
206-
<td>-</td>
207-
</tr>
208-
<tr>
209-
<td>Social Media / Post</td>
210-
<td>200</td>
211-
<td>300</td>
212-
<td>300</td>
213-
<td>500</td>
214-
<td>600</td>
215-
</tr>
216-
<tr>
217-
<td>Advertisement<br><font size="-1">(APP and Website)</font></td>
218-
<td>Included</td>
219-
<td>Included</td>
220-
<td>Included</td>
221-
<td>1,700</td>
222-
<td>1,700</td>
223-
</tr>
224-
<tr>
225-
<td>Ticket Discount</td>
226-
<td>10 % off<br><font size="-2">Up to 1/3 attendees</font></td>
227-
<td>10 % off<br><font size="-2">If more than 10 tickets</font></td>
228-
<td>10 % off<br><font size="-2">If more than 20 tickets</font></td>
229-
<td>10 % off<br><font size="-2">If more than 30 tickets</font></td>
230-
<td>10 % off<br><font size="-2">If more than 40 tickets</font></td>
231-
</tr>
176+
<thead>
177+
<tr>
178+
<th></th>
179+
<th>Diamond</th>
180+
<th>Platinum</th>
181+
<th>Golden</th>
182+
<th>Silver</th>
183+
<th>Bronze</th>
184+
</tr>
185+
</thead>
186+
<tbody>
187+
<tr>
188+
<th>Speaker Banquets / Person</th>
189+
<td>200</td>
190+
<td>200</td>
191+
<td>200</td>
192+
<td>200</td>
193+
<td>200</td>
194+
</tr>
195+
<tr>
196+
<th>Luxury Booth (Limit: 2)</th>
197+
<td>Included</td>
198+
<td>Included</td>
199+
<td>Included</td>
200+
<td>1,300</td>
201+
<td>-</td>
202+
</tr>
203+
<tr>
204+
<th>Talks (30 Mins.)<br><font size="-1">(Limit: 1 Per Community Track)</font></th>
205+
<td>Included</td>
206+
<td>Included</td>
207+
<td>500</td>
208+
<td>-</td>
209+
<td>-</td>
210+
</tr>
211+
<tr>
212+
<th>Social Media / Post</th>
213+
<td>200</td>
214+
<td>300</td>
215+
<td>300</td>
216+
<td>500</td>
217+
<td>600</td>
218+
</tr>
219+
<tr>
220+
<th>Advertisement<br><font size="-1">(APP and Website)</font></th>
221+
<td>Included</td>
222+
<td>Included</td>
223+
<td>Included</td>
224+
<td>1,700</td>
225+
<td>1,700</td>
226+
</tr>
227+
<tr>
228+
<th>Ticket Discount</th>
229+
<td>10 % off<br><font size="-2">Up to 1/3 attendees</font></td>
230+
<td>10 % off<br><font size="-2">If more than 10 tickets</font></td>
231+
<td>10 % off<br><font size="-2">If more than 20 tickets</font></td>
232+
<td>10 % off<br><font size="-2">If more than 30 tickets</font></td>
233+
<td>10 % off<br><font size="-2">If more than 40 tickets</font></td>
234+
</tr>
235+
</tbody>
232236
</table>
233237
</li>
234238
</ul>
235-
<ul style="list-style-type:square;">
239+
<ul class="square">
236240
<li>
237241
<b>Special and Customized Sponsorship</b>
238242
<br>
239-
<ul style="list-style-type:circle;">
243+
<ul class="white-circle">
240244
<li>
241245
<b>Community Track Venue Sponsorship</b> - USD$ 5,000 (Limit: TBA, See Notes)
242246
<br>

‎src/templates/pycontw-2020/contents/zh/sponsor/prospectus.html

+62-58
Original file line numberDiff line numberDiff line change
@@ -173,70 +173,74 @@ <h1>贊助方案</h1>
173173
<br>
174174
<br>
175175
<table class="table-sponsorship-prospectus">
176-
<tr>
177-
<td></td>
178-
<td>鑽石級</td>
179-
<td>白金級</td>
180-
<td>金級</td>
181-
<td>銀級</td>
182-
<td>銅級</td>
183-
</tr>
184-
<tr>
185-
<td>講者晚宴 (每人) </td>
186-
<td>6000</td>
187-
<td>6000</td>
188-
<td>6000</td>
189-
<td>6000</td>
190-
<td>6000</td>
191-
</tr>
192-
<tr>
193-
<td>主場地攤位 (上限：2)</td>
194-
<td>已包含</td>
195-
<td>已包含</td>
196-
<td>已包含</td>
197-
<td>40000</td>
198-
<td>無</td>
199-
</tr>
200-
<tr>
201-
<td>社群軌技術演講</td>
202-
<td>已包含</td>
203-
<td>已包含</td>
204-
<td>15000</td>
205-
<td>無</td>
206-
<td>無</td>
207-
</tr>
208-
<tr>
209-
<td>社群媒體宣傳 (每篇)</td>
210-
<td>6000</td>
211-
<td>9000</td>
212-
<td>9000</td>
213-
<td>15000</td>
214-
<td>18000</td>
215-
</tr>
216-
<tr>
217-
<td>網站/APP 廣告宣傳</td>
218-
<td>已包含</td>
219-
<td>已包含</td>
220-
<td>已包含</td>
221-
<td>50000</td>
222-
<td>50000</td>
223-
</tr>
224-
<tr>
225-
<td>門票優惠</td>
226-
<td>任意數量九折</td>
227-
<td>滿 10 張九折</td>
228-
<td>滿 20 張九折</td>
229-
<td>滿 30 張九折</td>
230-
<td>滿 40 張九折</td>
231-
</tr>
176+
<thead>
177+
<tr>
178+
<th></th>
179+
<th>鑽石級</th>
180+
<th>白金級</th>
181+
<th>金級</th>
182+
<th>銀級</th>
183+
<th>銅級</th>
184+
</tr>
185+
</thead>
186+
<tbody>
187+
<tr>
188+
<th>講者晚宴 (每人) </th>
189+
<td>6000</td>
190+
<td>6000</td>
191+
<td>6000</td>
192+
<td>6000</td>
193+
<td>6000</td>
194+
</tr>
195+
<tr>
196+
<th>主場地攤位 (上限：2)</th>
197+
<td>已包含</td>
198+
<td>已包含</td>
199+
<td>已包含</td>
200+
<td>40000</td>
201+
<td>無</td>
202+
</tr>
203+
<tr>
204+
<th>社群軌技術演講</th>
205+
<td>已包含</td>
206+
<td>已包含</td>
207+
<td>15000</td>
208+
<td>無</td>
209+
<td>無</td>
210+
</tr>
211+
<tr>
212+
<th>社群媒體宣傳 (每篇)</th>
213+
<td>6000</td>
214+
<td>9000</td>
215+
<td>9000</td>
216+
<td>15000</td>
217+
<td>18000</td>
218+
</tr>
219+
<tr>
220+
<th>網站/APP 廣告宣傳</th>
221+
<td>已包含</td>
222+
<td>已包含</td>
223+
<td>已包含</td>
224+
<td>50000</td>
225+
<td>50000</td>
226+
</tr>
227+
<tr>
228+
<th>門票優惠</th>
229+
<td>任意數量九折</td>
230+
<td>滿 10 張九折</td>
231+
<td>滿 20 張九折</td>
232+
<td>滿 30 張九折</td>
233+
<td>滿 40 張九折</td>
234+
</tr>
235+
</tbody>
232236
</table>
233237
</li>
234238
</ul>
235-
<ul style="list-style-type:square;">
239+
<ul class="square">
236240
<li>
237241
<b>特別贊助方案</b>
238242
<br>
239-
<ul style="list-style-type:circle;">
243+
<ul class="white-circle">
240244
<li>
241245
<b>社群軌場地認養</b> - 名額待訂 (詳見備註)，贊助金額：150,000 元
242246
<br>

0 commit comments

Comments
 (0)