Skip to content

Commit 358b217

Browse files
committed
Merge branch 'next-design-iteration' of github.com:jamstack/jamstack.org into next-design-iteration
2 parents dae2262 + fba62ab commit 358b217

File tree

5 files changed

+10
-11
lines changed

5 files changed

+10
-11
lines changed

src/css/tailwind.css

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ a.cta:visited {
6767
@apply bg-pink-900;
6868
@apply text-white;
6969
@apply rounded-full;
70-
@apply text-xs;
70+
@apply text-sm;
7171
@apply font-semibold;
7272
@apply px-4;
7373
@apply py-2;
@@ -195,7 +195,7 @@ footer p a:focus {
195195
}
196196
.list-jams-logo > li:after {
197197
background-image: url("data:image/svg+xml,%3Csvg width='8' viewBox='0 0 12 13' fill='none' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath d='M6 0C2.68226 0 0 2.90578 0 6.5C0 10.0942 2.68226 13 6 13C9.31774 13 12 10.0942 12 6.5V0H6Z' fill='%235A5F75'/%3E%3C/svg%3E%0A");
198-
left: 2em;
198+
left: 3em;
199199
}
200200
.list-jams-logo-pink > li:after {
201201
background-image: url("data:image/svg+xml,%3Csvg width='8' viewBox='0 0 12 13' fill='none' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath d='M6 0C2.68226 0 0 2.90578 0 6.5C0 10.0942 2.68226 13 6 13C9.31774 13 12 10.0942 12 6.5V0H6Z' fill='%23F0047F'/%3E%3C/svg%3E%0A");
@@ -205,7 +205,7 @@ footer p a:focus {
205205
@apply text-gray-400;
206206
content: "";
207207
position: absolute;
208-
left: 2.25em; /* 36px /16 */
208+
left: 3.25em; /* 36px /16 */
209209
top: 0;
210210
bottom: 0;
211211
border-left: 1px solid;

src/site/_includes/header.njk

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,8 @@
3939
{% include "navigation-links.njk" %}
4040

4141
<div>
42-
<a href="https://jamstackconf.com/" class="block p-4 my-4 bg-gradient-jams hover:bg-gradient-pink-orange font-bold text-center">Jamstack Conf</a>
43-
44-
<div class="text-center text-sm mb-4">Connect with us</div>
45-
<div class="grid grid-cols-3 divide-x divide-gray-700">
42+
<div class="text-center text-sm mb-4 text-gray-300">Connect with us</div>
43+
<div class="grid grid-cols-3 divide-x divide-gray-700 text-gray-300">
4644
<a href="https://jamstack.org/slack" target="_BLANK" rel="noopener" class="flex items-center justify-center p-4 hover:text-pink-500">
4745
<svg role="img" aria-label="Slack" focusable="false" width="30" height="30" class="fill-current"><use xlink:href="#logo-slack"></use></svg>
4846
</a>
@@ -53,6 +51,7 @@
5351
<svg role="img" aria-label="GitHub" focusable="false" width="36" height="36" class="fill-current"><use xlink:href="#logo-github"></use></svg>
5452
</a>
5553
</div>
54+
<a href="https://jamstackconf.com/" class="block p-4 mt-4 bg-gradient-jams hover:bg-gradient-pink-orange font-bold text-center">Jamstack Conf</a>
5655
</div>
5756
</nav>
5857
</details>

src/site/_includes/navigation-links.njk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
{%- for childlink in link.children %}
1313
<li>
1414
<a href="{{ childlink.url }}"
15-
class="block text-sm text-white hover:underline py-2 pl-12 pr-8{% if page.url.split("/")[1] == childlink.url.split("/")[1] %} bg-gray-900 font-bold{% endif %}">
15+
class="block text-sm text-white hover:underline py-2 pl-16 pr-8{% if page.url.split("/")[1] == childlink.url.split("/")[1] %} bg-gray-900 font-bold{% endif %}">
1616
{{ childlink.text }}
1717
</a>
1818
</li>

src/site/index.njk

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,13 @@ layout: layouts/base.njk
66
{% import "components/ticker.njk" as ticker %}
77
{% import "components/section-heading.njk" as section %}
88

9-
<section class="my-16 ">
9+
<section class="mt-16">
1010
<p class="w-1/2">Comprehensive guide for building Jamstack sites and home of the global Jamstack community.</p>
1111
<h1 class="hero-text">The modern way to&nbsp;build <img src="/img/svg/websites-and-apps.svg" width="545" height="88" alt="Websites and Apps" class="inline-block mr-2 hero-text-img"> that delivers better performance</h1>
1212
<a href="/community" class="cta">Join the global community</a>
1313
</section>
1414

1515
<section class="mb-20 p-0">
16-
<p class="px-8">Maximize efficiency with the tools you love</p>
1716
{{ ticker.icons() }}
1817
{{ ticker.main() }}
1918
</section>

tailwind.config.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,12 @@ module.exports = {
3131
900: "#0D0F18",
3232
700: "#2D3247",
3333
400: "#5A5F75",
34+
300: "#9AA0B6",
3435
200: "#DEDEDE",
3536
100: "#10121E"
3637
},
3738
pink : {
38-
900 : '#D81467', // old
39+
900 : '#D1036F', // old
3940
500 : '#F0047F',
4041
100 : '#FFB1C5' // old
4142
}

0 commit comments

Comments
 (0)