Skip to content

Commit c9a8e31

Browse files
authored
Merge pull request #73 from stackabletech/feat/redesign
feat: redesign
2 parents 75fc626 + 45d3e63 commit c9a8e31

File tree

14 files changed

+160
-138
lines changed

14 files changed

+160
-138
lines changed

gulp.d/tasks/build.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ module.exports = (src, dest, preview) => () => {
3737
}),
3838
postcssUrl([
3939
{
40-
filter: '**/~typeface-*/files/*',
40+
filter: '**/~@fontsource/*/files/*',
4141
url: (asset) => {
4242
const relpath = asset.pathname.substr(1)
4343
const abspath = require.resolve(relpath)

package-lock.json

Lines changed: 21 additions & 14 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,9 @@
2121
"devDependencies": {
2222
"@asciidoctor/core": "~2.2",
2323
"@asciidoctor/tabs": "^1.0.0-beta.6",
24+
"@fontsource/ibm-plex-mono": "^5.0.14",
25+
"@fontsource/noto-sans": "^5.0.22",
26+
"@fontsource/noto-sans-mono": "^5.0.20",
2427
"autoprefixer": "^10.4",
2528
"browser-pack-flat": "^3.4",
2629
"browserify": "^17.0",
@@ -57,8 +60,6 @@
5760
"require-from-string": "^2.0",
5861
"stylelint": "^13.13",
5962
"stylelint-config-standard": "^22",
60-
"typeface-roboto-mono": "1.1.13",
61-
"typeface-titillium-web": "1.1.13",
6263
"vinyl-buffer": "^1.0",
6364
"vinyl-fs": "^3.0"
6465
}

src/css/doc.css

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
.doc h5,
3333
.doc h6 {
3434
color: var(--heading-font-color);
35+
font-family: var(--header-font-family);
3536
font-weight: var(--heading-font-weight);
3637
hyphens: none;
3738
line-height: 1.3;

src/css/fonts.css

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
/* How do fonts work in this build setup?
2+
* Fonts are installed from fontsource packages.
3+
* In the file ./gulp.d/tasks/build.js there is an action that copies the font files
4+
* from the installed packages into the output directory, based on matching file names.
5+
* search for 'fontsource' in the file, and you will find a post CSS action.
6+
*/
7+
8+
/* Noto Sans - the base font for the body */
9+
10+
@font-face {
11+
font-family: "Noto Sans";
12+
font-style: normal;
13+
font-weight: 400;
14+
src:
15+
url(~@fontsource/noto-sans/files/noto-sans-latin-400-normal.woff2) format("woff2"),
16+
url(~@fontsource/noto-sans/files/noto-sans-latin-400-normal.woff) format("woff");
17+
}
18+
19+
@font-face {
20+
font-family: "Noto Sans";
21+
font-style: normal;
22+
font-weight: 700;
23+
src:
24+
url(~@fontsource/noto-sans/files/noto-sans-latin-700-normal.woff2) format("woff2"),
25+
url(~@fontsource/noto-sans/files/noto-sans-latin-700-normal.woff) format("woff");
26+
}
27+
28+
/* IMB Plex Mono - the header font */
29+
30+
@font-face {
31+
font-family: "IBM Plex Mono";
32+
font-style: normal;
33+
font-weight: 400;
34+
src:
35+
url(~@fontsource/ibm-plex-mono/files/ibm-plex-mono-latin-400-normal.woff2) format("woff2"),
36+
url(~@fontsource/ibm-plex-mono/files/ibm-plex-mono-latin-400-normal.woff) format("woff");
37+
}
38+
39+
@font-face {
40+
font-family: "IBM Plex Mono";
41+
font-style: normal;
42+
font-weight: 600;
43+
src:
44+
url(~@fontsource/ibm-plex-mono/files/ibm-plex-mono-latin-600-normal.woff2) format("woff2"),
45+
url(~@fontsource/ibm-plex-mono/files/ibm-plex-mono-latin-600-normal.woff) format("woff");
46+
}
47+
48+
/* Noto Sans Mono - The monospace font for code blocks */
49+
50+
@font-face {
51+
font-family: "Noto Sans Mono";
52+
font-style: normal;
53+
font-weight: 400;
54+
src:
55+
url(~@fontsource/noto-sans-mono/files/noto-sans-mono-latin-400-normal.woff2) format("woff2"),
56+
url(~@fontsource/noto-sans-mono/files/noto-sans-mono-latin-400-normal.woff) format("woff");
57+
}
58+
59+
@font-face {
60+
font-family: "Noto Sans Mono";
61+
font-style: normal;
62+
font-weight: 500;
63+
src:
64+
url(~@fontsource/noto-sans-mono/files/noto-sans-mono-latin-500-normal.woff2) format("woff2"),
65+
url(~@fontsource/noto-sans-mono/files/noto-sans-mono-latin-500-normal.woff) format("woff");
66+
}

src/css/footer.css

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ footer.footer {
44
font-size: calc(15 / var(--rem-base) * 1rem);
55
line-height: var(--footer-line-height);
66
padding: 1.5rem;
7+
padding-top: 5rem;
78
}
89

910
.footer p {
@@ -37,6 +38,13 @@ footer.footer {
3738

3839
.footer-info-item h2 {
3940
margin-top: 0;
41+
font-family: var(--header-font-family);
42+
font-weight: var(--heading-font-weight);
43+
}
44+
45+
.footer-motto {
46+
font-family: var(--header-font-family);
47+
font-weight: var(--heading-font-weight);
4048
}
4149

4250
.footer-link-list {
@@ -86,8 +94,8 @@ footer.footer {
8694
}
8795

8896
.social-icon {
89-
background-color: var(--footer-font-color);
90-
color: var(--body-font-color);
97+
color: var(--footer-font-color);
98+
background-color: var(--footer-background);
9199
border-radius: 50%;
92100
display: inline-flex;
93101
align-items: center;
@@ -100,8 +108,8 @@ footer.footer {
100108
}
101109

102110
.social-icon:hover {
111+
color: var(--footer-background);
103112
background-color: var(--color-brand-primary);
104-
color: var(--footer-font-color);
105113
text-decoration: none;
106114
}
107115

@@ -110,3 +118,7 @@ footer.footer {
110118
height: 1px;
111119
background-color: var(--footer-font-color);
112120
}
121+
122+
.copyright-notice {
123+
color: var(--footer-copyright-font-color);
124+
}

src/css/header.css

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ body {
2323
display: flex;
2424
justify-content: space-between;
2525
padding: 0 1rem;
26+
box-shadow: 0 8px 10px 0 rgba(0, 0, 0, 0.1);
2627
}
2728

2829
.navbar a {
@@ -142,6 +143,7 @@ body {
142143
.navbar-dropdown {
143144
background: var(--navbar-menu-background);
144145
border: 1px solid var(--navbar-menu-border-color);
146+
box-shadow: 0 4px 10px -2px rgba(0, 0, 0, 0.1);
145147
border-top: none;
146148
border-radius: 0 0 0.25rem 0.25rem;
147149
display: none;

src/css/nav.css

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
position: static;
3232
top: 0;
3333
visibility: visible;
34+
border-right: solid 2px var(--panel-background);
3435
}
3536
}
3637

@@ -96,6 +97,11 @@ html.is-clipped--nav {
9697
padding: 0.5rem 0.75rem;
9798
line-height: var(--nav-line-height);
9899
position: relative;
100+
color: var(--nav-muted-color);
101+
}
102+
103+
.nav-menu:hover {
104+
color: var(--nav-font-color);
99105
}
100106

101107
.nav-menu h3.title {

src/css/site.css

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
@import "typeface-roboto-mono.css";
2-
@import "typeface-titillium-web.css";
1+
@import "fonts.css";
32
@import "vars.css";
43
@import "base.css";
54
@import "body.css";

src/css/toolbar.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
color: var(--toolbar-font-color);
88
align-items: center;
99
background-color: var(--toolbar-background);
10-
box-shadow: 0 1px 0 var(--toolbar-border-color);
10+
border-bottom: solid 2px var(--toolbar-border-color);
1111
display: flex;
1212
font-size: calc(15 / var(--rem-base) * 1rem);
1313
height: var(--toolbar-height);

0 commit comments

Comments
 (0)