Skip to content

Commit 12e723d

Browse files
committed
initial header work on updated design
1 parent 76d5a38 commit 12e723d

File tree

8 files changed

+46
-49
lines changed

8 files changed

+46
-49
lines changed

Diff for: _includes/header.html

+10-10
Original file line numberDiff line numberDiff line change
@@ -18,22 +18,22 @@
1818
<div class="wrapper">
1919
<div class="content">
2020
<nav class="site-brand">
21-
<div class="site-logo">
22-
<a href="{{ "/" | relative_url }}">
23-
<img src="{{ "/assets/images/logo.png" | relative_url }}"
24-
srcset="{{ "/assets/images/logo.png" | relative_url }} 1x,
25-
{{ "/assets/images/[email protected]" | relative_url }} 2x,
26-
{{ "/assets/images/[email protected]" | relative_url }} 3x"
27-
alt="CircuitPython Logo"
28-
height="60" width="136">
29-
</a>
30-
</div>
3121
<div class="site-navigation">
3222
<a {% if current[1] == 'downloads' %}class="active" aria-current="page"{% endif %} href="{{ "/downloads" | relative_url }}">Downloads</a>
3323
<a {% if current[1] == 'libraries' %}class="active" aria-current="page"{% endif %} href="{{ "/libraries" | relative_url }}">Libraries</a>
3424
<a {% if current[1] == 'blinka' %}class="active" aria-current="page"{% endif %} href="{{ "/blinka" | relative_url }}">Blinka</a>
3525
<a href="https://code.circuitpython.org">Code Editor</a>
3626
</div>
27+
<div class="site-logo">
28+
<a href="{{ "/" | relative_url }}">
29+
<img src="{{ "/assets/images/logo-dark.png" | relative_url }}"
30+
srcset="{{ "/assets/images/logo-dark.png" | relative_url }} 1x,
31+
{{ "/assets/images/[email protected]" | relative_url }} 2x,
32+
{{ "/assets/images/logo-dark3x.png" | relative_url }} 3x"
33+
alt="CircuitPython Logo"
34+
height="60" width="136">
35+
</a>
36+
</div>
3737
<div class="get-started">
3838
<a href="https://learn.adafruit.com/welcome-to-circuitpython">Get Started</a>
3939
</div>

Diff for: assets/images/logo-dark.png

2.15 KB
Loading

Diff for: assets/images/[email protected]

4.44 KB
Loading

Diff for: assets/images/[email protected]

6.65 KB
Loading

Diff for: assets/sass/base/_base.scss

+17-11
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
body {
2-
font-family: "Proxima Nova","Montserrat","Lucida Grande","Lucida Sans Unicode","Lucida Sans",Geneva,Verdana,sans-serif;
3-
background-color: #ebebeb;
1+
body {
2+
font-family: "Proxima Nova", "Montserrat", "Lucida Grande",
3+
"Lucida Sans Unicode", "Lucida Sans", Geneva, Verdana, sans-serif;
4+
background-color: #f0f0f0;
45
}
56

67
a {
@@ -11,7 +12,11 @@ a {
1112
clear: both;
1213
}
1314

14-
h1, h2, h3, h4, h5 {
15+
h1,
16+
h2,
17+
h3,
18+
h4,
19+
h5 {
1520
font-weight: 500;
1621
}
1722

@@ -35,14 +40,15 @@ a.purple-button-link {
3540
}
3641

3742
fieldset {
38-
border: 0;
43+
border: 0;
3944

40-
legend {
41-
font-size: 1.5em;
42-
font-weight: 500;
43-
}
45+
legend {
46+
font-size: 1.5em;
47+
font-weight: 500;
48+
}
4449
}
4550

46-
input.filter-checkbox, label {
47-
cursor: pointer;
51+
input.filter-checkbox,
52+
label {
53+
cursor: pointer;
4854
}

Diff for: assets/sass/layout/_header.scss

+17-26
Original file line numberDiff line numberDiff line change
@@ -3,27 +3,17 @@
33
grid-template-rows: 40px 1fr 3px;
44
grid-column: full;
55

6-
&> * {
7-
display: grid;
8-
9-
grid-template-columns:
10-
[full-start] minmax(1em, 1fr)
11-
[main-start] minmax(0, 80em) [main-end]
12-
minmax(1em, 1fr) [full-end];
13-
14-
&> * {
15-
grid-column: main;
16-
}
17-
}
18-
196
.wrapper {
20-
background-color: #333333;
21-
height: 100px;
7+
@include readable-content;
228
}
239

2410
.content {
2511
display: grid;
26-
padding-bottom: 20px;
12+
background-color: #fff;
13+
height: 100px;
14+
border-radius: 25px;
15+
padding: 0 25px;
16+
margin: 20px;
2717
}
2818

2919
a.active {
@@ -32,13 +22,14 @@
3222
}
3323

3424
.top-navigation {
35-
background-color: #151515;
25+
@include readable-content;
26+
background-color: #333;
3627
padding-top: 10px;
37-
28+
3829
.navigation {
3930
display: flex;
40-
align-items: flex-end;
41-
justify-content: flex-end;
31+
align-items: flex-start;
32+
justify-content: flex-start;
4233

4334
a {
4435
font-size: 16px;
@@ -61,13 +52,13 @@
6152
}
6253
}
6354

64-
&> a {
55+
& > a {
6556
margin-left: 40px;
6657
}
67-
&> span {
58+
& > span {
6859
margin-left: 35px;
6960
a {
70-
margin-left: 5px;
61+
margin-left: 5px;
7162
}
7263
}
7364
}
@@ -77,7 +68,7 @@
7768
width: 100%;
7869
display: flex;
7970
flex-direction: row;
80-
align-items: flex-end;
71+
align-items: center;
8172
}
8273

8374
.site-logo {
@@ -106,8 +97,8 @@
10697
font-size: 18px;
10798

10899
a {
109-
margin-left: 40px;
110-
color: #aaa;
100+
margin-right: 30px;
101+
color: #63338f;
111102

112103
&:hover {
113104
color: #fff;

0 commit comments

Comments
 (0)