Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

New logo #91

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions _includes/logos/Impresso-logo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion _includes/nav.html
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
>
{% comment %} logo {% endcomment %}
<a class="nav-link" href="{{site.baseurl}}/">
<div>{% include logos/Impresso_logo.svg %}</div>
<div>{% include logos/Impresso-logo.svg %}</div>
</a>
</div>
</li>
Expand Down
98 changes: 54 additions & 44 deletions _layouts/default.html
Original file line number Diff line number Diff line change
Expand Up @@ -111,30 +111,30 @@

<style>
@font-face {
font-family: 'Satoshi-Variable';
src: url('/assets/fonts/Satoshi-Variable.woff2') format('woff2'),
url('/assets/fonts/Satoshi-Variable.woff') format('woff'),
url('/assets/fonts/Satoshi-Variable.ttf') format('truetype');
font-family: "Satoshi-Variable";
src: url("/assets/fonts/Satoshi-Variable.woff2") format("woff2"),
url("/assets/fonts/Satoshi-Variable.woff") format("woff"),
url("/assets/fonts/Satoshi-Variable.ttf") format("truetype");
font-weight: 300 900;
font-display: swap;
font-style: normal;
}

@font-face {
font-family: 'Sentient-Variable';
src: url('/assets/fonts/Sentient-Variable.woff2') format('woff2'),
url('/assets/fonts/Sentient-Variable.woff') format('woff'),
url('/assets/fonts/Sentient-Variable.ttf') format('truetype');
font-family: "Sentient-Variable";
src: url("/assets/fonts/Sentient-Variable.woff2") format("woff2"),
url("/assets/fonts/Sentient-Variable.woff") format("woff"),
url("/assets/fonts/Sentient-Variable.ttf") format("truetype");
font-weight: 200 700;
font-display: swap;
font-style: normal;
}

@font-face {
font-family: 'Satoshi-VariableItalic';
src: url('/assets/fonts/Satoshi-VariableItalic.woff2') format('woff2'),
url('/assets/fonts/Satoshi-VariableItalic.woff') format('woff'),
url('/assets/fonts/Satoshi-VariableItalic.ttf') format('truetype');
font-family: "Satoshi-VariableItalic";
src: url("/assets/fonts/Satoshi-VariableItalic.woff2") format("woff2"),
url("/assets/fonts/Satoshi-VariableItalic.woff") format("woff"),
url("/assets/fonts/Satoshi-VariableItalic.ttf") format("truetype");
font-weight: 300 900;
font-display: swap;
font-style: italic;
Expand All @@ -145,15 +145,15 @@
}
/* color palette: https://coolors.co/212529-fafbf2-fe938c-ad91a3-ffe587 */
:root {
--bs-font-sans-serif: 'Satoshi-Variable', -apple-system,
BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen', 'Ubuntu',
'Cantarell', 'Fira Sans', 'Droid Sans', 'Helvetica Neue', sans-serif;
--bs-font-serif: 'Sentient-Variable', 'Georgia', 'Times New Roman',
--bs-font-sans-serif: "Satoshi-Variable", -apple-system,
BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen", "Ubuntu",
"Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue", sans-serif;
--bs-font-serif: "Sentient-Variable", "Georgia", "Times New Roman",
serif;
--bs-body-color-transparent: #21252999;
--bs-font-sans-serif-italic: 'Satoshi-VariableItalic', -apple-system,
BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen', 'Ubuntu',
'Cantarell', 'Fira Sans', 'Droid Sans', 'Helvetica Neue', sans-serif;
--bs-font-sans-serif-italic: "Satoshi-VariableItalic", -apple-system,
BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen", "Ubuntu",
"Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue", sans-serif;
--bs-gutter-x: 0;
--bs-border-width: 1px;
--bs-link-color: #212529ff;
Expand Down Expand Up @@ -248,7 +248,7 @@
font-size: 1.5rem;
line-height: 1.5em;
font-weight: 400;
font-variation-settings: 'wght' 400;
font-variation-settings: "wght" 400;
}

@media (min-width: 1200px) {
Expand Down Expand Up @@ -280,6 +280,10 @@
body.dark .btn-primary {
color: var(--bs-dark-fixed);
}

body.dark .btn-primary:hover {
color: var(--bs-primary);
}
body.dark .btn.btn-primary .icon-container {
border-color: var(--bs-dark-fixed);
}
Expand Down Expand Up @@ -342,6 +346,9 @@
body.dark .btn-primary .icon path {
stroke: var(--bs-dark-fixed);
}
body.dark .btn-primary:hover .icon path {
stroke: var(--bs-primary);
}
body.dark .Timeline__item.disabled .icon path {
background-color: var(--bs-primary-transparent);
}
Expand All @@ -366,13 +373,16 @@
background-color: var(--bs-dark-fixed);
border-color: var(--bs-primary);
}
body.light .btn-primary {
/* body.light .btn-primary {
color: var(--bs-dark-fixed);
}
body.light .btn-primary:hover {
border-color: var(--bs-dark-fixed);
} */

.btn-primary:hover {
border-color: var(--bs-primary);
background-color: var(--bs-dark-fixed);
color: var(--bs-primary);
}

body.light .btn-primary:hover .icon path {
stroke: var(--bs-primary);
}
Expand Down Expand Up @@ -455,12 +465,12 @@
strong {
font-weight: 700;

font-variation-settings: 'wght' 700;
font-variation-settings: "wght" 700;
}
i,
em {
font-style: normal;
font-family: 'Satoshi-VariableItalic', sans-serif;
font-family: "Satoshi-VariableItalic", sans-serif;
}

aside.Nav {
Expand All @@ -486,7 +496,7 @@
}
aside.Nav .nav-item:not(.squared)::after {
background-color: var(--bs-dark);
content: '';
content: "";
position: absolute;
top: 48px;
bottom: 10px;
Expand All @@ -503,7 +513,7 @@
}

aside.Nav .nav-item.active > .nav-link > span::after {
content: '';
content: "";
position: absolute;
top: 0;
bottom: 0;
Expand Down Expand Up @@ -553,21 +563,21 @@
font-size: 0.8em;
text-transform: uppercase;
font-weight: 550;
font-variation-settings: 'wght' 550;
font-variation-settings: "wght" 550;
letter-spacing: 0.75px;
}

.small-caps b,
b.small-caps,
.small-caps.fw-bold {
font-weight: 700;
font-variation-settings: 'wght' 700;
font-variation-settings: "wght" 700;
}

.Release h4,
.Announcement h4 {
font-weight: 350;
font-variation-settings: 'wght' 350;
font-variation-settings: "wght" 350;
}

@media (prefers-color-scheme: dark) {
Expand Down Expand Up @@ -670,22 +680,22 @@
</style>
<!-- Matomo -->
<script>
var _paq = (window._paq = window._paq || [])
var _paq = (window._paq = window._paq || []);
/* tracker methods like "setCustomDimension" should be called before "trackPageView" */
_paq.push(['trackPageView'])
_paq.push(['enableLinkTracking'])
;(function () {
var u = 'https://journalofdigitalhistory.matomo.cloud/'
_paq.push(['setTrackerUrl', u + 'matomo.php'])
_paq.push(['setSiteId', '7'])
_paq.push(["trackPageView"]);
_paq.push(["enableLinkTracking"]);
(function () {
var u = "https://journalofdigitalhistory.matomo.cloud/";
_paq.push(["setTrackerUrl", u + "matomo.php"]);
_paq.push(["setSiteId", "7"]);
var d = document,
g = d.createElement('script'),
s = d.getElementsByTagName('script')[0]
g.async = true
g = d.createElement("script"),
s = d.getElementsByTagName("script")[0];
g.async = true;
g.src =
'https://cdn.matomo.cloud/journalofdigitalhistory.matomo.cloud/matomo.js'
s.parentNode.insertBefore(g, s)
})()
"https://cdn.matomo.cloud/journalofdigitalhistory.matomo.cloud/matomo.js";
s.parentNode.insertBefore(g, s);
})();
</script>
<!-- End Matomo Code -->
</head>
Expand Down