Skip to content
Merged
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
4 changes: 4 additions & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ GEM
logger
faraday-net_http (3.4.0)
net-http (>= 0.5.0)
ffi (1.17.1-aarch64-linux-gnu)
ffi (1.17.1-arm64-darwin)
ffi (1.17.1-x64-mingw-ucrt)
ffi (1.17.1-x86_64-linux-gnu)
Expand Down Expand Up @@ -264,6 +265,8 @@ GEM
minitest (5.25.4)
net-http (0.6.0)
uri
nokogiri (1.18.9-aarch64-linux-gnu)
racc (~> 1.4)
nokogiri (1.18.9-arm64-darwin)
racc (~> 1.4)
nokogiri (1.18.9-x64-mingw-ucrt)
Expand Down Expand Up @@ -318,6 +321,7 @@ GEM
zeitwerk (2.7.2)

PLATFORMS
aarch64-linux
arm64-darwin-22
arm64-darwin-23
arm64-darwin-24
Expand Down
2 changes: 1 addition & 1 deletion _sass/layout/cheatsheet.scss
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

.content-primary.cheatsheet {
code {
font-family: 'Consolas';
font-family: 'Inconsolata';
}

pre.highlight {
Expand Down
4 changes: 2 additions & 2 deletions _sass/layout/type-md.scss
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@
dt,
dd {
code {
font-family: 'Consolas';
font-family: 'Inconsolata';
background-color: #fff;
color: #859900;
@include border-radius($border-radius-medium);
Expand All @@ -174,7 +174,7 @@
tr,
td{
code {
font-family: 'Consolas';
font-family: 'Inconsolata';
font-size: 0.9375rem;
}
}
Expand Down
2 changes: 1 addition & 1 deletion _sass/vendors/bourbon/addons/_font-stacks.scss
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ $lucida-grande: "Lucida Grande", "Tahoma", "Verdana", "Arial", sans-serif;
///
/// @type List

$monospace: "Bitstream Vera Sans Mono", "Consolas", "Courier", monospace;
$monospace: "Bitstream Vera Sans Mono", "Inconsolata", "Courier", monospace;

/// Verdana font stack.
///
Expand Down
2 changes: 1 addition & 1 deletion resources/css/highlightjs.css
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ github.com style (c) Vasily Polovnyov <vast@whiteants.net>
*/

.hljs {
font-family: 'Consolas';
font-family: 'Inconsolata';
display: block;
overflow-x: auto;
padding: 0.5em;
Expand Down
28 changes: 8 additions & 20 deletions resources/css/monospace.css
Original file line number Diff line number Diff line change
Expand Up @@ -2,41 +2,29 @@
---

@font-face {
font-family: 'Consolas';
src: url('{{ site.baseurl }}/resources/glyphs/Consolas.eot');
src: url('{{ site.baseurl }}/resources/glyphs/Consolas.eot?#iefix') format('embedded-opentype'),
url('{{ site.baseurl }}/resources/glyphs/Consolas.woff') format('woff'),
url('{{ site.baseurl }}/resources/glyphs/Consolas.ttf') format('truetype');
font-family: 'Inconsolata';
src:url('{{ site.baseurl }}/resources/glyphs/Inconsolata_SemiExpanded-SemiBold.ttf') format('truetype');
font-weight: normal;
font-style: normal;
}

@font-face {
font-family: 'Consolas';
src: url('{{ site.baseurl }}/resources/glyphs/Consolas-BoldItalic.eot');
src: url('{{ site.baseurl }}/resources/glyphs/Consolas-BoldItalic.eot?#iefix') format('embedded-opentype'),
url('{{ site.baseurl }}/resources/glyphs/Consolas-BoldItalic.woff') format('woff'),
url('{{ site.baseurl }}/resources/glyphs/Consolas-BoldItalic.ttf') format('truetype');
font-family: 'Inconsolata';
src: url('{{ site.baseurl }}/resources/glyphs/Inconsolata_SemiExpanded-Bold.ttf') format('truetype');
font-weight: bold;
font-style: italic;
}

@font-face {
font-family: 'Consolas';
src: url('{{ site.baseurl }}/resources/glyphs/Consolas-Italic.eot');
src: url('{{ site.baseurl }}/resources/glyphs/Consolas-Italic.eot?#iefix') format('embedded-opentype'),
url('{{ site.baseurl }}/resources/glyphs/Consolas-Italic.woff') format('woff'),
url('{{ site.baseurl }}/resources/glyphs/Consolas-Italic.ttf') format('truetype');
font-family: 'Inconsolata';
src: url('{{ site.baseurl }}/resources/glyphs/Inconsolata_SemiExpanded-SemiBold.ttf') format('truetype');
font-weight: normal;
font-style: italic;
}

@font-face {
font-family: 'Consolas';
src: url('{{ site.baseurl }}/resources/glyphs/Consolas-Bold.eot');
src: url('{{ site.baseurl }}/resources/glyphs/Consolas-Bold.eot?#iefix') format('embedded-opentype'),
url('{{ site.baseurl }}/resources/glyphs/Consolas-Bold.woff') format('woff'),
url('{{ site.baseurl }}/resources/glyphs/Consolas-Bold.ttf') format('truetype');
font-family: 'Inconsolata';
src: url('{{ site.baseurl }}/resources/glyphs/Inconsolata_SemiExpanded-Bold.ttf') format('truetype');
font-weight: bold;
font-style: normal;
}
Binary file removed resources/glyphs/Consolas-Bold.eot
Binary file not shown.
Binary file removed resources/glyphs/Consolas-Bold.ttf
Binary file not shown.
Binary file removed resources/glyphs/Consolas-Bold.woff
Binary file not shown.
Binary file removed resources/glyphs/Consolas-BoldItalic.eot
Binary file not shown.
Binary file removed resources/glyphs/Consolas-BoldItalic.ttf
Binary file not shown.
Binary file removed resources/glyphs/Consolas-BoldItalic.woff
Binary file not shown.
Binary file removed resources/glyphs/Consolas-Italic.eot
Binary file not shown.
Binary file removed resources/glyphs/Consolas-Italic.ttf
Binary file not shown.
Binary file removed resources/glyphs/Consolas-Italic.woff
Binary file not shown.
Binary file removed resources/glyphs/Consolas.eot
Binary file not shown.
Binary file removed resources/glyphs/Consolas.ttf
Binary file not shown.
Binary file removed resources/glyphs/Consolas.woff
Binary file not shown.
Binary file not shown.
Binary file not shown.
2 changes: 1 addition & 1 deletion resources/images/scala3-book/hierarchy.dot
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
digraph unix {
rankdir = BT;
size="6,6";
node [color=lightblue2, style=filled, fontname="Consolas"];
node [color=lightblue2, style=filled, fontname="Inconsolata"];


{rank=same; "AnyVal"; "AnyRef / Object"}
Expand Down
26 changes: 13 additions & 13 deletions resources/images/scala3-book/hierarchy.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.