Skip to content

Commit

Permalink
style: update fonts+
Browse files Browse the repository at this point in the history
  • Loading branch information
h-enk committed Nov 16, 2020
1 parent e344436 commit 41d63a2
Show file tree
Hide file tree
Showing 35 changed files with 178 additions and 114 deletions.
23 changes: 15 additions & 8 deletions assets/scss/common/_dark.scss
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@ $button-color-dark: $link-color-dark;
$focus-color-dark: lighten($link-color-dark, 2.5%);
$selection-color-dark: lighten($link-color-dark, 2.5%);

$navbar-dark-brand-color: $link-color-dark;
$navbar-dark-brand-hover-color: $body-color-dark;
$navbar-dark-color: $body-color-dark;
$navbar-dark-hover-color: $link-color-dark;
$navbar-dark-active-color: $link-color-dark;
Expand Down Expand Up @@ -51,12 +49,7 @@ body.dark.home .navbar {
}

body.dark .navbar-light .navbar-brand {
color: $navbar-dark-brand-color !important;
}

body.dark .navbar-light .navbar-brand:hover,
body.dark .navbar-light .navbar-brand:focus {
color: $navbar-dark-brand-hover-color !important;
color: $navbar-dark-color !important;
}

body.dark .navbar-light .navbar-nav .nav-link {
Expand Down Expand Up @@ -96,6 +89,15 @@ body.dark .page-links a {
color: $body-color-dark;
}

body.dark .showcase-meta a {
color: $body-color-dark;
}

body.dark .showcase-meta a:hover,
body.dark .showcase-meta a:focus {
color: $link-color-dark;
}

body.dark .docs-link:hover,
body.dark .docs-link.active,
body.dark .page-links a:hover {
Expand All @@ -107,6 +109,11 @@ body.dark .navbar-light .navbar-text a {
color: $navbar-dark-active-color;
}

body.dark .docs-links h3.sidebar-link a,
body.dark .page-links h3.sidebar-link a {
color: $body-color-dark;
}

body.dark .navbar-light .navbar-text a:hover,
body.dark .navbar-light .navbar-text a:focus {
color: $navbar-dark-active-color;
Expand Down
70 changes: 44 additions & 26 deletions assets/scss/common/_fonts.scss
Original file line number Diff line number Diff line change
@@ -1,53 +1,71 @@
/* jost-regular - latin */
@font-face {
font-family: Jost;
src: local("Jost"), url(/fonts/vendor/jost/Jost-400-Book.otf);
font-family: "Jost";
font-style: normal;
font-weight: 400;
font-display: swap;
src:
local("Jost"),
url("/fonts/vendor/jost/jost-v4-latin-regular.woff2") format("woff2"),
url("/fonts/vendor/jost/jost-v4-latin-regular.woff") format("woff"); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
}

/* jost-500 - latin */
@font-face {
font-family: Jost;
src: local("Jost"), url(/fonts/vendor/jost/Jost-400-BookItalic.otf);
font-weight: 400;
font-display: swap;
font-style: italic;
}

@font-face {
font-family: Jost;
src: local("Jost"), url(/fonts/vendor/jost/Jost-500-Medium.otf);
font-family: "Jost";
font-style: normal;
font-weight: 500;
font-display: swap;
src:
local("Jost"),
url("/fonts/vendor/jost/jost-v4-latin-500.woff2") format("woff2"),
url("/fonts/vendor/jost/jost-v4-latin-500.woff") format("woff"); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
}

/* jost-700 - latin */
@font-face {
font-family: Jost;
src: local("Jost"), url(/fonts/vendor/jost/Jost-500-MediumItalic.otf);
font-weight: 500;
font-family: "Jost";
font-style: normal;
font-weight: 700;
font-display: swap;
font-style: italic;
src:
local("Jost"),
url("/fonts/vendor/jost/jost-v4-latin-700.woff2") format("woff2"),
url("/fonts/vendor/jost/jost-v4-latin-700.woff") format("woff"); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
}

/*
/* jost-italic - latin */
@font-face {
font-family: Jost;
src: local("Jost"), url(/fonts/vendor/jost/Jost-600-Semi.otf);
font-weight: 600;
font-family: "Jost";
font-style: italic;
font-weight: 400;
font-display: swap;
src:
local("Jost"),
url("/fonts/vendor/jost/jost-v4-latin-italic.woff2") format("woff2"),
url("/fonts/vendor/jost/jost-v4-latin-italic.woff") format("woff"); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
}

/* jost-500italic - latin */
@font-face {
font-family: Jost;
src: local("Jost"), url(/fonts/vendor/jost/Jost-600-SemiItalic.otf);
font-family: "Jost";
font-style: italic;
font-weight: 600;
font-weight: 500;
font-display: swap;
src:
local("Jost"),
url("/fonts/vendor/jost/jost-v4-latin-500italic.woff2") format("woff2"),
url("/fonts/vendor/jost/jost-v4-latin-500italic.woff") format("woff"); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
}

/* jost-700italic - latin */
@font-face {
font-family: Jost;
src: local("Jost"), url(/fonts/vendor/jost/Jost-700-Bold.otf);
font-family: "Jost";
font-style: italic;
font-weight: 700;
font-display: swap;
src:
local("Jost"),
url("/fonts/vendor/jost/jost-v4-latin-700italic.woff2") format("woff2"),
url("/fonts/vendor/jost/jost-v4-latin-700italic.woff") format("woff"); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
}
*/
9 changes: 9 additions & 0 deletions assets/scss/common/_global.scss
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,11 @@ h6,
}
}

.home h1 {
/* font-size: calc(1.375rem + 1.5vw); */
font-size: calc(1.875rem + 1.5vw);
}

.section {
padding-top: 5rem;
padding-bottom: 5rem;
Expand Down Expand Up @@ -181,6 +186,10 @@ body {
z-index: -1;
}

.bg-dots-md {
margin-top: -11rem;
}

.bg-dots-lg {
margin-top: -12rem;
}
Expand Down
4 changes: 3 additions & 1 deletion assets/scss/common/_variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,9 @@ $font-size-sm: $font-size-base * 0.875;
$line-height-base: 1.5;

$headings-font-family: null;
$headings-font-weight: 500;
$headings-font-weight: 700;

$lead-font-weight: 400;

// Spacing
//
Expand Down
6 changes: 3 additions & 3 deletions assets/scss/layouts/_header.scss
Original file line number Diff line number Diff line change
Expand Up @@ -99,20 +99,20 @@

.navbar-form {
margin-top: 0;
margin-left: 9rem;
margin-left: 6rem;
margin-right: 1.5rem;
}
}

@include media-breakpoint-up(lg) {
.navbar-form {
margin-left: 18rem;
margin-left: 15rem;
}
}

@include media-breakpoint-up(xl) {
.navbar-form {
margin-left: 36rem;
margin-left: 30rem;
}
}

Expand Down
5 changes: 5 additions & 0 deletions config/_default/menus.toml
Original file line number Diff line number Diff line change
Expand Up @@ -32,3 +32,8 @@
url = "https://github.com/h-enk/doks"
post = "v0.1.0"
weight = 20

# [[footer]]
# name = "Privacy"
# url = "/privacy-policy/"
# weight = 10
7 changes: 4 additions & 3 deletions config/_default/params.toml
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,16 @@ themeColor = "#fff"

quality = 85
bgColor = "#fff"
landscapePhotoWidths = [1000, 800, 700, 600, 500]
landscapePhotoWidths = [900, 800, 700, 600, 500]
portraitPhotoWidths = [800, 700, 600, 500]
lqipWidth = "20x"

footer = "This site is powered by <a href=\"https://gohugo.io/\">Hugo</a> and the <a href=\"https://getdoks.org/\">Doks</a> theme."
footer = "Powered by <a href=\"https://www.netlify.com/\">Netlify</a>, <a href=\"https://gohugo.io/\">Hugo</a>, and <a href=\"https://getdoks.org/\">Doks</a>"

alert = false
alertText = "Like Doks? <a class=\"alert-link\" href=\"https://github.com/h-enk/doks/stargazers\">Star on GitHub</a>. Thanks!</a>"

hyasVersion = "v0.2.0"
hyasVersion = "v1.2.8"
doksVersion = "v0.1.1"

docsRepo = "https://github.com/h-enk/doks"
4 changes: 2 additions & 2 deletions content/contact/index.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
---
title: "Contact"
description: "Email Henk Verlinde"
description: "Drop us an email."
date: 2020-08-27T19:25:12+02:00
lastmod: 2020-08-27T19:25:12+02:00
draft: true
images: []
---

<p><script type="text/javascript" nonce="dXNlcj0iaGVsbG8iLGRvbWFpbj0iaGVua3ZlcmxpbmRlLmNvbSIsZG9jdW1lbnQud3JpdGUodXNlcisiQCIrZG9tYWluKTs=">user="hello",domain="henkverlinde.com",document.write(user+"@"+domain);</script><noscript>hello at henkverlinde.com</noscript></p>
{{< email user="hello" domain="getdoks.org" >}}
28 changes: 25 additions & 3 deletions content/docs/help/faq.md
Original file line number Diff line number Diff line change
@@ -1,21 +1,43 @@
---
title: "FAQ"
description: "FAQ Doks."
lead: ""
description: "Answers to frequently asked questions."
lead: "Answers to frequently asked questions."
date: 2020-10-06T08:49:31+00:00
lastmod: 2020-10-06T08:49:31+00:00
draft: false
images: []
menu:
docs:
parent: "help"
weight: 410
weight: 540
toc: true
---

## Hyas?

Doks is a [Hyas theme](https://gethyas.com/themes/) build by the creator of Hyas.

## Footer notice?

Please keep it in place.

## Keyboard shortcuts for search?

- focus: `/`
- select: `` and ``
- open: `Enter`
- close: `Esc`

## Can I get support?

Create a topic:

- [Netlify Community](https://community.netlify.com/)
- [Hugo Forums](https://discourse.gohugo.io/)

## Contact the creator?

Send `h-enk` a message:

- [Netlify Community](https://community.netlify.com/)
- [Hugo Forums](https://discourse.gohugo.io/)
6 changes: 3 additions & 3 deletions content/docs/prologue/commands.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,23 +36,23 @@ npm run lint
Check scripts for errors:

```bash
npm run lint:scripts [--fix]
npm run lint:scripts [-- --fix]
```

### styles

Check styles for errors:

```bash
npm run lint:styles [--fix]
npm run lint:styles [-- --fix]
```

### markdown

Check markdown for errors:

```bash
npm run lint:markdown [--fix]
npm run lint:markdown [-- --fix]
```

## clean
Expand Down
26 changes: 13 additions & 13 deletions content/privacy-policy/index.md
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
---
title: "Privacy Policy"
description: "Privacy Policy Doks"
description: "We do not use cookies and we do not collect any personal data."
date: 2020-08-27T19:23:18+02:00
lastmod: 2020-08-27T19:23:18+02:00
draft: true
images: []
---

__TLDR__: I do not use cookies and I do not collect any personal data.
__TLDR__: We do not use cookies and we do not collect any personal data.

## Website visitors

Expand All @@ -18,19 +18,19 @@ __TLDR__: I do not use cookies and I do not collect any personal data.
- No information is mined and harvested for personal and behavioral trends.
- No information is monetized.

### Information I collect and what I use it for
### Information we collect and what we use it for

I run [Plausible](https://plausible.io/) analytics on gethyas.com. The following information is collected:
We run [Plausible](https://plausible.io/) analytics on getdoks.org. The following information is collected:

- __Page URL__. I track the page URL of each page view on this website. I use this to understand which pages have been viewed and how many times a particular page has been viewed. For example: _https://gethyas.com/_.
- __HTTP Referrer__. I use the referrer string to understand the number of visitors referred to this website from links on other sites. For example: _https://github.com/_.
- __Browser__. I use this to understand what browsers people use when visiting this website. This is derived from the User-Agent HTTP header. The full User-Agent is discarded. For example: _Chrome_.
- __Operating system__. I use this to understand what operating systems people use when visiting this website. I only use the brand of the operating system and don’t include the version number or any other details. This is derived from the User-Agent HTTP header. The full User-Agent is discarded. For example: _GNU/Linux_.
- __Device type__. I use this to understand what devices people use when visiting this website. This is derived from window.innerWidth. The actual width of the browser in pixels is discarded. For example: _Desktop_.
- __Visitor Country__. I look up the visitor’s country using the IP address. I do not track anything more granular than the country of origin and the IP address of the visitor is discarded. I never store IP addresses in my database or logs. For example: _Canada_.
- __Page URL__. We track the page URL of each page view on this website. We use this to understand which pages have been viewed and how many times a particular page has been viewed. For example: _https://getdoks.org/_.
- __HTTP Referrer__. We use the referrer string to understand the number of visitors referred to this website from links on other sites. For example: _https://github.com/_.
- __Browser__. We use this to understand what browsers people use when visiting this website. This is derived from the User-Agent HTTP header. The full User-Agent is discarded. For example: _Chrome_.
- __Operating system__. We use this to understand what operating systems people use when visiting this website. We only use the brand of the operating system and don’t include the version number or any other details. This is derived from the User-Agent HTTP header. The full User-Agent is discarded. For example: _GNU/Linux_.
- __Device type__. We use this to understand what devices people use when visiting this website. This is derived from window.innerWidth. The actual width of the browser in pixels is discarded. For example: _Desktop_.
- __Visitor Country__. We look up the visitor’s country using the IP address. We do not track anything more granular than the country of origin and the IP address of the visitor is discarded. We never store IP addresses in our database or logs. For example: _Canada_.

## Contact me
## Contact us

[Contact me]({{< ref "contact/index.md" >}}) if you have any questions.
[Contact us]({{< ref "contact/index.md" >}}) if you have any questions.

Effective Date: _20th July 2020_
Effective Date: _27th August 2020_
Loading

0 comments on commit 41d63a2

Please sign in to comment.