Skip to content

fix font paths #44

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.

Sign up for GitHub

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

Merged
merged 3 commits into from
Nov 29, 2022
Merged

fix font paths #44

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e8f6b14
fix font paths
mojavelinux Nov 21, 2022
3a4f2bc
use toc data-title attribute properly
mojavelinux Nov 19, 2022
60b129b
CSS refinements
mojavelinux Nov 19, 2022
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
4 changes: 2 additions & 2 deletions preview-src/index.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
= Hardware and Software Requirements
= Hardware & Software Requirements
Author Name
:idprefix:
:idseparator: -
Expand Down Expand Up @@ -196,7 +196,7 @@ agam graeci
At ornatus splendide sed.

.Library dependencies
[#dependencies%autowidth%footer,stripes=hover]
[#dependencies%footer,stripes=hover]
|===
|Library |Version

Expand Down
7 changes: 3 additions & 4 deletions src/css/doc.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -425,11 +425,11 @@ h1.page + aside.toc.embedded {
}

.doc ul.circle {
list-style-type: square;
list-style-type: circle;
}

.doc ul.disc {
list-style-type: square;
list-style-type: disc;
}

.doc ul.square {
Expand Down Expand Up @@ -605,7 +605,7 @@ h1.page + aside.toc.embedded {
display: flex;
flex-direction: column;
align-items: center;
background: transparent;
background: none;
border: none;
color: inherit;
outline: none;
Expand Down Expand Up @@ -818,5 +818,4 @@ h1.page + aside.toc.embedded {

html.dark-theme .doc img {
filter: invert();
-webkit-filter: invert(100%);
}
2 changes: 0 additions & 2 deletions src/css/spring/asciidoctor.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,8 +282,6 @@
/* Tables */

.doc table.tableblock {
display: block;
width: 100%;
overflow-x: auto;
font-size: calc(15 / var(--pixel-to-rem));
margin: 1.5rem 0 0;
Expand Down
2 changes: 1 addition & 1 deletion src/css/spring/codetools.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ code:not(.unfolded) span.fold-block.hide-when-unfolded {

code.unfolded span.fold-block.hide-when-unfolded,
code:not(.unfolded) span.fold-block.hide-when-folded {
max-height: none;
max-height: 0;
opacity: 0;
}

Expand Down
2 changes: 1 addition & 1 deletion src/css/spring/settings.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
/* General */
--html-font-size: 1em;
--pixel-to-rem: 16 * 1rem;
--font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol"; /* stylelint-disable-line */
--font-family: -apple-system, blinkmacsystemfont, "Segoe UI", "Roboto", "Helvetica", "Arial", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
--font-weight: 400;
--monospace-font-family: "SFMono-Regular", "Consolas", "Liberation Mono", "Menlo", monospace;
--body-background-color: white;
Expand Down
14 changes: 6 additions & 8 deletions src/css/typeface-roboto-mono.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,17 @@
font-style: normal;
font-weight: 400;
src:
local("Roboto Mono Regular"),
local("RobotoMono-Regular"),
url(~typeface-roboto-mono/files/roboto-mono-latin-400.woff2) format("woff2"),
url(~typeface-roboto-mono/files/roboto-mono-latin-400.woff) format("woff");
url(~@fontsource/roboto-mono/files/roboto-mono-latin-400-normal.woff2) format("woff2"),
url(~@fontsource/roboto-mono/files/roboto-mono-latin-400-normal.woff) format("woff");
unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
}

@font-face {
font-family: "Roboto Mono";
font-style: normal;
font-weight: 500;
src:
local("Roboto Mono Medium"),
local("RobotoMono-Medium"),
url(~typeface-roboto-mono/files/roboto-mono-latin-500.woff2) format("woff2"),
url(~typeface-roboto-mono/files/roboto-mono-latin-500.woff) format("woff");
url(~@fontsource/roboto-mono/files/roboto-mono-latin-500-normal.woff2) format("woff2"),
url(~@fontsource/roboto-mono/files/roboto-mono-latin-500-normal.woff) format("woff");
unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
}
28 changes: 12 additions & 16 deletions src/css/typeface-roboto.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,41 +3,37 @@
font-style: normal;
font-weight: 400;
src:
local("Roboto Regular"),
local("Roboto-Regular"),
url(~typeface-roboto/files/roboto-latin-400.woff2) format("woff2"),
url(~typeface-roboto/files/roboto-latin-400.woff) format("woff");
url(~@fontsource/roboto/files/roboto-latin-400-normal.woff2) format("woff2"),
url(~@fontsource/roboto/files/roboto-latin-400-normal.woff) format("woff");
unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
}

@font-face {
font-family: "Roboto";
font-style: italic;
font-weight: 400;
src:
local("Roboto Italic"),
local("Roboto-Italic"),
url(~typeface-roboto/files/roboto-latin-400italic.woff2) format("woff2"),
url(~typeface-roboto/files/roboto-latin-400italic.woff) format("woff");
url(~@fontsource/roboto/files/roboto-latin-400-italic.woff2) format("woff2"),
url(~@fontsource/roboto/files/roboto-latin-400-italic.woff) format("woff");
unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
}

@font-face {
font-family: "Roboto";
font-style: normal;
font-weight: 500;
src:
local("Roboto Medium"),
local("Roboto-Medium"),
url(~typeface-roboto/files/roboto-latin-500.woff2) format("woff2"),
url(~typeface-roboto/files/roboto-latin-500.woff) format("woff");
url(~@fontsource/roboto/files/roboto-latin-500-normal.woff2) format("woff2"),
url(~@fontsource/roboto/files/roboto-latin-500-normal.woff) format("woff");
unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
}

@font-face {
font-family: "Roboto";
font-style: italic;
font-weight: 500;
src:
local("Roboto Medium Italic"),
local("Roboto-MediumItalic"),
url(~typeface-roboto/files/roboto-latin-500italic.woff2) format("woff2"),
url(~typeface-roboto/files/roboto-latin-500italic.woff) format("woff");
url(~@fontsource/roboto/files/roboto-latin-500-italic.woff2) format("woff2"),
url(~@fontsource/roboto/files/roboto-latin-500-italic.woff) format("woff");
unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
}
4 changes: 2 additions & 2 deletions src/css/vars.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
/* General */
--html-font-size: 1em;
--pixel-to-rem: 16 * 1rem;
--font-family: -apple-system, blinkmacsystemfont, "Segoe UI", roboto, helvetica, arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
--font-family: -apple-system, blinkmacsystemfont, "Segoe UI", "Roboto", "Helvetica", "Arial", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
--font-weight: 400;
--monospace-font-family: "SFMono-Regular", "Consolas", "Liberation Mono", "Menlo", monospace;
--body-background-color: white;
Expand All @@ -41,7 +41,7 @@
--body-font-size--print: 0.9375em; /* 15px */
--body-line-height: 1.15;
--body-font-color: #191e1e;
--body-font-family: "roboto", sans-serif;
--body-font-family: "Roboto", sans-serif;
--body-font-weight-bold: 500;
--monospace-font-weight-bold: 500;
/* base */
Expand Down
3 changes: 1 addition & 2 deletions src/js/02-on-this-page.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,10 @@
}, document.createElement('ul'))

var menu = sidebar.querySelector('.toc-menu')
var titlePage = document.getElementById('page-title')
if (!menu) (menu = document.createElement('div')).className = 'toc-menu'

var title = document.createElement('h3')
title.textContent = titlePage.textContent || 'Contents'
title.textContent = sidebar.dataset.title || 'Contents'
menu.appendChild(title)
menu.appendChild(list)

Expand Down
2 changes: 1 addition & 1 deletion src/partials/toc.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<aside class="toc sidebar" data-title="{{or page.attributes.toctitle 'Contents'}}" data-levels="{{{or page.attributes.toclevels 2}}}">
<aside class="toc sidebar" data-title="{{{detag page.title}}}" data-levels="{{{or page.attributes.toclevels 2}}}">
<div class="toc-menu"></div>
</aside>