Skip to content

Commit 2cc6eab

Browse files
authored
Merge pull request #24 from theShinigami/color-name-change
tailwind custom color name change
2 parents 5ed6b6d + 4930dd0 commit 2cc6eab

13 files changed

+24
-24
lines changed

src/_includes/date-card.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<div class="flex flex-wrap items-center gap-4">
22
<time class="flex flex-col min-w-28">
3-
<span class="px-3 py-1 text-xl font-semibold text-center text-white bg-brick-red rounded-t-md">{{ month }}</span>
3+
<span class="px-3 py-1 text-xl font-semibold text-center text-white bg-red rounded-t-md">{{ month }}</span>
44
<span class="px-3 py-2 text-2xl text-center text-black bg-white border-2 border-t-0 border-gray-300 rounded-b-md">{{ days }}</span>
55
</time>
66
<h3 class="flex-1 text-xl font-semibold lg:text-2xl">{{ heading }}</h3>

src/_includes/nav.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<a href="/about" data-menu-trigger>About</a>
77
<ul
88
data-menu-list
9-
class="flex-col hidden gap-6 px-4 py-2 mt-2 border-l-4 border-ice-cream-purple lg:absolute lg:top-full lg:border-4 lg:bg-white lg:left-1/2 lg:translate-x-[-50%] lg:w-[24ch] lg:p-6 rounded font-medium">
9+
class="flex-col hidden gap-6 px-4 py-2 mt-2 border-l-4 border-purple lg:absolute lg:top-full lg:border-4 lg:bg-white lg:left-1/2 lg:translate-x-[-50%] lg:w-[24ch] lg:p-6 rounded font-medium">
1010
<li><a href="/about/" role="menuitem">About DjangoCon US</a></li>
1111
<li><a href="/tickets/" role="menuitem">Tickets</a></li>
1212
<li><a href="/faq/" role="menuitem">FAQ</a></li>
@@ -23,7 +23,7 @@
2323
<a href="/speaking/" data-menu-trigger>Speaking</a>
2424
<ul
2525
data-menu-list
26-
class="flex-col hidden gap-6 px-4 py-2 mt-2 border-l-4 border-ice-cream-purple lg:absolute lg:top-full lg:border-4 lg:bg-white lg:left-1/2 lg:translate-x-[-50%] lg:w-[26ch] lg:p-6 rounded font-medium">
26+
class="flex-col hidden gap-6 px-4 py-2 mt-2 border-l-4 border-purple lg:absolute lg:top-full lg:border-4 lg:bg-white lg:left-1/2 lg:translate-x-[-50%] lg:w-[26ch] lg:p-6 rounded font-medium">
2727
<li><a href="/speaking/">Speaking at DjangoCon US</a></li>
2828
<li><a href="/speaking/speaker-resources/">Speaker Resources</a></li>
2929
</ul>
@@ -32,7 +32,7 @@
3232
<a href="/sponsors/" data-menu-trigger>Sponsors</a>
3333
<ul
3434
data-menu-list
35-
class="flex-col hidden gap-6 px-4 py-2 mt-2 border-l-4 border-ice-cream-purple lg:absolute lg:top-full lg:border-4 lg:bg-white lg:left-1/2 lg:translate-x-[-50%] lg:w-[24ch] lg:p-6 rounded font-medium">
35+
class="flex-col hidden gap-6 px-4 py-2 mt-2 border-l-4 border-purple lg:absolute lg:top-full lg:border-4 lg:bg-white lg:left-1/2 lg:translate-x-[-50%] lg:w-[24ch] lg:p-6 rounded font-medium">
3636
<li><a href="/sponsors/">Our Sponsors</a></li>
3737
<li><a href="/sponsors/information/">Sponsorship Prospectus</a></li>
3838
</ul>

src/_includes/organizers-grid.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ <h2 class="mb-2 text-xl font-heading lg:text-2xl">{{ organizer.data.name }}</h2>
6060
href="{{ organizer.data.social.website }}"
6161
target="_blank"
6262
rel="noopener noreferrer"
63-
class="hover:text-central-park-green"
63+
class="hover:text-green"
6464
aria-label="Website">
6565
<svg class="icon">
6666
<use xlink:href="#web-icon"></use>

src/_layouts/session-details.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ <h3 class="text-xl font-semibold leading-4 lg:text-3xl">{{ presenter.data.name }
110110
href="{{ presenter.data.social.website }}"
111111
target="_blank"
112112
rel="noopener noreferrer"
113-
class="hover:text-central-park-green"
113+
class="hover:text-green"
114114
aria-label="Website">
115115
<svg class="icon">
116116
<use xlink:href="#web-icon"></use>

src/about/conduct.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ <h1 class="mb-8 pageheading">{{ title }}</h1>
3636
<p>Thank you for helping make this a welcoming, friendly event for all.</p>
3737
</section>
3838

39-
<section class="self-start p-8 prose bg-white border-4 rounded border-central-park-green lg:prose-lg">
39+
<section class="self-start p-8 prose bg-white border-4 rounded border-green lg:prose-lg">
4040
<h2 class="mb-8 text-lg font-bold font-heading lg:text-2xl">Need help?</h2>
4141
<div class="space-y-6 lead">
4242
<p>If you are being harassed, notice that someone else is being harassed, or have any other concerns, please contact the conference Code of Conduct committee at <a href="mailto:{{ site.conduct_email }}" class="link">{{ site.conduct_email }}</a>{% comment %} or <a href="tel:201-899-4189" class="link">201-899-4189</a>{% endcomment %}.</p>

src/about/public-health.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ <h2 id="public-health-policy">Public Health Policy</h2>
4646
<p>DjangoCon US reserves the right to increase the requirements of this policy based on COVID-19 infection, hospitalization or positive test rates as reported by the CDC. We may also be required to alter our policy to conform with local, state, or federal mandates.</p>
4747
</div>
4848

49-
<section class="self-start p-8 prose bg-white border-4 rounded border-central-park-green lg:prose-lg">
49+
<section class="self-start p-8 prose bg-white border-4 rounded border-green lg:prose-lg">
5050
<h2 id="public-health-policy-tldr">TLDR: A short-version of the policy is as follows:</h2>
5151
<ul>
5252
<li>Negative test required to enter conference</li>

src/about/tickets.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ <h2 class="mb-8 text-xl font-medium font-heading lg:text-3xl">Which ticket shoul
4848
target="_blank">Buy Tickets Now</a>
4949
</section>
5050

51-
<section class="self-start p-8 prose bg-white border-4 rounded border-central-park-green lg:prose-lg">
51+
<section class="self-start p-8 prose bg-white border-4 rounded border-green lg:prose-lg">
5252
<h3 class="mb-8 text-lg font-bold font-heading lg:text-2xl">Don't Forget!</h3>
5353
<ul class="px-4 space-y-4 list-disc lg:text-xl">
5454
<li>Early bird tickets are on sale through May 31st or until they're gone.</li>
@@ -163,7 +163,7 @@ <h2 class="mb-8 text-2xl font-bold font-heading lg:text-4xl">What is the refund
163163
</section>
164164

165165
<div>
166-
<section class="p-8 prose bg-white border-4 rounded border-central-park-green lg:prose-lg">
166+
<section class="p-8 prose bg-white border-4 rounded border-green lg:prose-lg">
167167
<p>PLEASE do not come in person if you feel at all sick of any kind. Even if the conference has already begun, we can help get you connected virtually.</p>
168168

169169
<p>In-person tickets can be converted to online tickets at ANY TIME. For that refund amount, we will take the cost of your ticket, subtract the value of the online equivalent, and then apply the same discount percentage above.</p>

src/assets/css/components/_buttons.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
@apply border-b-4 border-r-4;
1010

1111

12-
background: linear-gradient(to bottom, transparent 50%, theme('colors.carolina-yellow') 50%);
12+
background: linear-gradient(to bottom, transparent 50%, theme('colors.yellow') 50%);
1313
background-size: 100% 200%;
1414
background-position: top;
1515
transition: all .125s ease-out;

src/assets/css/main.css

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@
108108
content: '';
109109

110110
opacity: 0.4;
111-
background: linear-gradient(126deg, theme('colors.mosaic-blue') 11.2%, theme('colors.lucky-orange') 69.95%, theme('colors.brick-red') 90.34%);
111+
background: linear-gradient(126deg, theme('colors.mosaic-blue') 11.2%, theme('colors.orange') 69.95%, theme('colors.red') 90.34%);
112112
}
113113

114114
.photo-effect img {
@@ -190,7 +190,7 @@
190190

191191
[data-menu-trigger]::after {
192192
@apply block w-5 h-5;
193-
@apply bg-ice-cream-purple;
193+
@apply bg-purple;
194194

195195
mask: url('/assets/img/theme/icons/Triangle.svg');
196196
mask-size: cover;

src/schedule.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ <h2 class="mb-1 font-bold uppercase sr-only">Jump to day</h2>
3636
<li>
3737
<a href="#Day-{{ forloop.index }}" class="group">
3838
<time class="flex flex-col">
39-
<span class="px-3 min-w-[8ch] text-lg font-semibold text-center text-white bg-brick-red rounded-t-md border-2 border-brick-red group-hover:border-black group-hover:border-b-brick-red">{{ day[0] | utcDate | date: "%a" }}</span>
39+
<span class="px-3 min-w-[8ch] text-lg font-semibold text-center text-white bg-red rounded-t-md border-2 border-red group-hover:border-black group-hover:border-b-red">{{ day[0] | utcDate | date: "%a" }}</span>
4040
<span class="px-3 py-1 text-center text-black bg-white border-2 border-t-0 border-gray-300 rounded-b-md group-hover:border-black">{{ day[0] | utcDate | date: "%b %-d" }}</span>
4141
</time>
4242
</a>
@@ -75,9 +75,9 @@ <h3 class="w-full font-medium text-gray-500 lg:text-lg lg:py-6 lg:sticky lg:top-
7575
{% for session in slot.sessions %}
7676
{% assign color_class = "border-t-mosaic-blue" %}
7777
{% if forloop.index == 1 %}
78-
{% assign color_class = "border-t-central-park-green" %}
78+
{% assign color_class = "border-t-green" %}
7979
{% elsif forloop.index == 2 %}
80-
{% assign color_class = "border-t-ice-cream-purple" %}
80+
{% assign color_class = "border-t-purple" %}
8181
{% endif %}
8282
{% include "session-card.html" with color=color_class %}
8383
{% endfor %}

src/sponsors/information.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ <h2 id="our-goal-is-to-keep-ticket-costs-low-while-providing">Our goal is to kee
4242

4343
<p>Because the conference is organized by <a href="https://www.defna.org/">DEFNA</a>, a non-profit 501(c)(3) organization, your sponsorship is tax-deductible!</p>
4444
</div>
45-
<aside class="flex flex-wrap items-center self-start gap-8 p-8 bg-white border-4 rounded border-central-park-green">
45+
<aside class="flex flex-wrap items-center self-start gap-8 p-8 bg-white border-4 rounded border-green">
4646
<h2 class="flex-1 text-lg font-bold font-heading lg:text-2xl">Want to know more about sponsorship?</h2>
4747
<p><a href="mailto:sponsors@djangocon.us" class="button">Contact Us Today</a></p>
4848
</aside>

src/visa-invitation.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,10 +63,10 @@ <h1 class="mb-6 text-center pageheading">{{ title }}</h1>
6363

6464
<div>
6565
<div id="loader" hidden></div>
66-
<p id="inProgressMsg" hidden class="max-w-2xl p-4 mx-auto text-lg bg-white border-4 rounded lg:p-12 text-medium lg:text-xl border-central-park-green">
66+
<p id="inProgressMsg" hidden class="max-w-2xl p-4 mx-auto text-lg bg-white border-4 rounded lg:p-12 text-medium lg:text-xl border-green">
6767
Thank you for your interest in DjangoCon US 2024! We're generating your invitation letter.
6868
</p>
69-
<p id="readyMsg" hidden class="max-w-2xl p-4 mx-auto text-lg bg-white border-4 rounded lg:p-12 text-medium lg:text-xl border-central-park-green">Your invitation letter has been sent to the DjangoCon US organizers for review. Once they approve it, they will email it to you. Thanks for your interest!</p>
69+
<p id="readyMsg" hidden class="max-w-2xl p-4 mx-auto text-lg bg-white border-4 rounded lg:p-12 text-medium lg:text-xl border-green">Your invitation letter has been sent to the DjangoCon US organizers for review. Once they approve it, they will email it to you. Thanks for your interest!</p>
7070
</div>
7171
</div>
7272
</div>

tailwind.config.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@ module.exports = {
1010
sans: ['Poppins', 'sans-serif'],
1111
},
1212
colors: {
13-
'brick-red': '#DB433B',
14-
'lucky-orange': '#F39745',
13+
'red': '#DB433B',
14+
'orange': '#F39745',
1515
'bull-blue': '#3D9CFB',
1616
'mosaic-blue': '#5FBFFA',
17-
'ice-cream-purple': '#B989C9',
18-
'central-park-green': '#64A03D',
19-
'carolina-yellow': '#E7BB43',
17+
'purple': '#B989C9',
18+
'green': '#64A03D',
19+
'yellow': '#E7BB43',
2020

2121
'social-facebook': '#0866ff',
2222
'social-linkedin': '#2d64bc',

0 commit comments

Comments
 (0)