Skip to content

Commit 9cde741

Browse files
committed
more work with two columns and header
1 parent a120a72 commit 9cde741

File tree

8 files changed

+71
-279
lines changed

8 files changed

+71
-279
lines changed

_config.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,9 @@ email: [email protected]
33
description: >-
44
The easiest way to program microcontrollers
55
site_image: "https://circuitpython.org/assets/images/CircuitPythonLogo_Black.png"
6-
hero_image: CircuitPython_Hero.jpg
76
timezone: America/New_York
87
twitter_username: circuitpython
9-
github_username: adafruit
8+
github_username: adafruit
109
baseurl: ""
1110
url: "https://circuitpython.org"
1211
paginate: 5
@@ -39,7 +38,7 @@ collections:
3938

4039
jekyll_get_json:
4140
- data: libraries
42-
json: 'https://adafruit-circuit-python.s3.amazonaws.com/adabot/web/libraries.v2.json'
41+
json: "https://adafruit-circuit-python.s3.amazonaws.com/adabot/web/libraries.v2.json"
4342

4443
### Exclude from processing.
4544
exclude:

_includes/header.html

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,5 +40,4 @@
4040
</nav>
4141
</div>
4242
</div>
43-
<div class="bottom-bar"></div>
4443
</header>

_includes/header_mobile.html

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,5 +40,4 @@
4040
</ul>
4141
</nav>
4242
</div>
43-
<div class="bottom-bar"></div>
4443
</header>
83.7 KB
Loading

assets/sass/layout/_header.scss

Lines changed: 15 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#site-header {
22
display: grid;
3-
grid-template-rows: 40px 1fr 3px;
3+
grid-template-rows: 40px 1fr;
44
grid-column: full;
55

66
.wrapper {
@@ -13,7 +13,7 @@
1313
height: 100px;
1414
border-radius: 25px;
1515
padding: 0 25px;
16-
margin: 20px;
16+
margin: 20px 0;
1717
}
1818

1919
a.active {
@@ -24,16 +24,14 @@
2424
.top-navigation {
2525
@include readable-content;
2626
background-color: #333;
27-
padding-top: 10px;
2827

2928
.navigation {
30-
display: flex;
31-
align-items: flex-start;
32-
justify-content: flex-start;
33-
29+
margin-left: 15px;
30+
padding: 10px;
3431
a {
3532
font-size: 16px;
3633
color: #aaa;
34+
margin-right: 40px;
3735

3836
&:hover {
3937
color: #fff;
@@ -51,16 +49,6 @@
5149
transform: translateY(0%);
5250
}
5351
}
54-
55-
& > a {
56-
margin-left: 40px;
57-
}
58-
& > span {
59-
margin-left: 35px;
60-
a {
61-
margin-left: 5px;
62-
}
63-
}
6452
}
6553
}
6654

@@ -69,6 +57,16 @@
6957
display: flex;
7058
flex-direction: row;
7159
align-items: center;
60+
61+
.get-started {
62+
display: flex;
63+
flex: 2 1 0;
64+
justify-content: end;
65+
66+
a {
67+
@include rounded-button;
68+
}
69+
}
7270
}
7371

7472
.site-logo {
@@ -84,16 +82,6 @@
8482
}
8583
}
8684

87-
.get-started {
88-
display: flex;
89-
flex: 2 1 0;
90-
justify-content: end;
91-
92-
a {
93-
@include rounded-button;
94-
}
95-
}
96-
9785
.site-navigation {
9886
flex: 2 1 0;
9987
padding: 0 0 10px 0;
@@ -109,10 +97,6 @@
10997
}
11098
}
11199

112-
.bottom-bar {
113-
background-color: #e71c8c;
114-
}
115-
116100
@media (max-width: $screen-xs-max) {
117101
#site-header {
118102
display: none !important;

assets/sass/pages/_downloads.scss

Lines changed: 17 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,20 @@
11
#downloads-page {
22
padding: 50px 0 200px 0;
33
display: grid;
4-
grid-template-columns:
5-
[full-start] minmax(1em, 1fr)
6-
[main-start] minmax(0, 80em) [main-end]
7-
minmax(1em, 1fr) [full-end];
8-
grid-row-gap: 1em;
4+
grid-template-columns:
5+
[full-start] minmax(1em, 1fr)
6+
[main-start] minmax(0, 80em) [main-end]
7+
minmax(1em, 1fr) [full-end];
8+
grid-row-gap: 1em;
99

10-
&> * {
10+
& > * {
1111
grid-column: main;
1212
}
1313

1414
h1 {
15-
1615
}
1716

18-
&> p {
17+
& > p {
1918
font-size: 1.2em;
2019
margin-top: 0;
2120
}
@@ -33,7 +32,7 @@
3332
position: relative;
3433

3534
&:before {
36-
font-family: 'Font Awesome\ 5 Free';
35+
font-family: "Font Awesome\ 5 Free";
3736
font-size: 24px;
3837
font-weight: 900;
3938
color: #652f8f;
@@ -112,7 +111,7 @@
112111
border-bottom: 1px solid $gray-border;
113112
padding: 20px;
114113

115-
&> div {
114+
& > div {
116115
grid-column: main;
117116
display: grid;
118117
grid-template-columns: repeat(3, minmax(200px, 1fr));
@@ -176,15 +175,15 @@
176175
padding-top: 75%;
177176
position: relative;
178177
width: 100%;
179-
}
180178

181-
img {
182-
position: absolute;
183-
top: 50%;
184-
left: 50%;
185-
max-width: 100%;
186-
max-height: 100%;
187-
transform: translate(-50%, -50%);
179+
img {
180+
position: absolute;
181+
top: 50%;
182+
left: 50%;
183+
max-width: 100%;
184+
max-height: 100%;
185+
transform: translate(-50%, -50%);
186+
}
188187
}
189188

190189
a {
@@ -222,7 +221,6 @@
222221
text-transform: capitalize;
223222
}
224223
}
225-
226224
}
227225

228226
h3 {

0 commit comments

Comments
 (0)