diff --git a/Gemfile.lock b/Gemfile.lock index 77e4acdf9c..8c4594c786 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -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) @@ -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) @@ -318,6 +321,7 @@ GEM zeitwerk (2.7.2) PLATFORMS + aarch64-linux arm64-darwin-22 arm64-darwin-23 arm64-darwin-24 diff --git a/_sass/layout/cheatsheet.scss b/_sass/layout/cheatsheet.scss index 691a34b38b..a9acf9a5db 100644 --- a/_sass/layout/cheatsheet.scss +++ b/_sass/layout/cheatsheet.scss @@ -4,7 +4,7 @@ .content-primary.cheatsheet { code { - font-family: 'Consolas'; + font-family: 'Inconsolata'; } pre.highlight { diff --git a/_sass/layout/type-md.scss b/_sass/layout/type-md.scss index 6548b1ff60..76b737d048 100755 --- a/_sass/layout/type-md.scss +++ b/_sass/layout/type-md.scss @@ -163,7 +163,7 @@ dt, dd { code { - font-family: 'Consolas'; + font-family: 'Inconsolata'; background-color: #fff; color: #859900; @include border-radius($border-radius-medium); @@ -174,7 +174,7 @@ tr, td{ code { - font-family: 'Consolas'; + font-family: 'Inconsolata'; font-size: 0.9375rem; } } diff --git a/_sass/vendors/bourbon/addons/_font-stacks.scss b/_sass/vendors/bourbon/addons/_font-stacks.scss index 57128f422a..351f5df5f2 100755 --- a/_sass/vendors/bourbon/addons/_font-stacks.scss +++ b/_sass/vendors/bourbon/addons/_font-stacks.scss @@ -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. /// diff --git a/resources/css/highlightjs.css b/resources/css/highlightjs.css index 1db8a26ed4..acbdceed9d 100644 --- a/resources/css/highlightjs.css +++ b/resources/css/highlightjs.css @@ -5,7 +5,7 @@ github.com style (c) Vasily Polovnyov */ .hljs { - font-family: 'Consolas'; + font-family: 'Inconsolata'; display: block; overflow-x: auto; padding: 0.5em; diff --git a/resources/css/monospace.css b/resources/css/monospace.css index 67e622e269..661410f641 100644 --- a/resources/css/monospace.css +++ b/resources/css/monospace.css @@ -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; } diff --git a/resources/glyphs/Consolas-Bold.eot b/resources/glyphs/Consolas-Bold.eot deleted file mode 100644 index 1981119648..0000000000 Binary files a/resources/glyphs/Consolas-Bold.eot and /dev/null differ diff --git a/resources/glyphs/Consolas-Bold.ttf b/resources/glyphs/Consolas-Bold.ttf deleted file mode 100644 index 231576b0e9..0000000000 Binary files a/resources/glyphs/Consolas-Bold.ttf and /dev/null differ diff --git a/resources/glyphs/Consolas-Bold.woff b/resources/glyphs/Consolas-Bold.woff deleted file mode 100644 index 1899dbd063..0000000000 Binary files a/resources/glyphs/Consolas-Bold.woff and /dev/null differ diff --git a/resources/glyphs/Consolas-BoldItalic.eot b/resources/glyphs/Consolas-BoldItalic.eot deleted file mode 100644 index 107dc0bef7..0000000000 Binary files a/resources/glyphs/Consolas-BoldItalic.eot and /dev/null differ diff --git a/resources/glyphs/Consolas-BoldItalic.ttf b/resources/glyphs/Consolas-BoldItalic.ttf deleted file mode 100644 index 2a98047bd3..0000000000 Binary files a/resources/glyphs/Consolas-BoldItalic.ttf and /dev/null differ diff --git a/resources/glyphs/Consolas-BoldItalic.woff b/resources/glyphs/Consolas-BoldItalic.woff deleted file mode 100644 index 828c0282dc..0000000000 Binary files a/resources/glyphs/Consolas-BoldItalic.woff and /dev/null differ diff --git a/resources/glyphs/Consolas-Italic.eot b/resources/glyphs/Consolas-Italic.eot deleted file mode 100644 index deeed93678..0000000000 Binary files a/resources/glyphs/Consolas-Italic.eot and /dev/null differ diff --git a/resources/glyphs/Consolas-Italic.ttf b/resources/glyphs/Consolas-Italic.ttf deleted file mode 100644 index 9966bed49f..0000000000 Binary files a/resources/glyphs/Consolas-Italic.ttf and /dev/null differ diff --git a/resources/glyphs/Consolas-Italic.woff b/resources/glyphs/Consolas-Italic.woff deleted file mode 100644 index 9828b0da82..0000000000 Binary files a/resources/glyphs/Consolas-Italic.woff and /dev/null differ diff --git a/resources/glyphs/Consolas.eot b/resources/glyphs/Consolas.eot deleted file mode 100644 index 3506f34f1e..0000000000 Binary files a/resources/glyphs/Consolas.eot and /dev/null differ diff --git a/resources/glyphs/Consolas.ttf b/resources/glyphs/Consolas.ttf deleted file mode 100644 index 743cbfaf1a..0000000000 Binary files a/resources/glyphs/Consolas.ttf and /dev/null differ diff --git a/resources/glyphs/Consolas.woff b/resources/glyphs/Consolas.woff deleted file mode 100644 index 6078102f80..0000000000 Binary files a/resources/glyphs/Consolas.woff and /dev/null differ diff --git a/resources/glyphs/Inconsolata_SemiExpanded-Bold.ttf b/resources/glyphs/Inconsolata_SemiExpanded-Bold.ttf new file mode 100644 index 0000000000..7e9e39ac34 Binary files /dev/null and b/resources/glyphs/Inconsolata_SemiExpanded-Bold.ttf differ diff --git a/resources/glyphs/Inconsolata_SemiExpanded-SemiBold.ttf b/resources/glyphs/Inconsolata_SemiExpanded-SemiBold.ttf new file mode 100644 index 0000000000..6036377d37 Binary files /dev/null and b/resources/glyphs/Inconsolata_SemiExpanded-SemiBold.ttf differ diff --git a/resources/images/scala3-book/hierarchy.dot b/resources/images/scala3-book/hierarchy.dot index 24e6c2a896..d6e1ff8783 100644 --- a/resources/images/scala3-book/hierarchy.dot +++ b/resources/images/scala3-book/hierarchy.dot @@ -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"} diff --git a/resources/images/scala3-book/hierarchy.svg b/resources/images/scala3-book/hierarchy.svg index 013848749e..5f83fcf2b8 100644 --- a/resources/images/scala3-book/hierarchy.svg +++ b/resources/images/scala3-book/hierarchy.svg @@ -13,13 +13,13 @@ AnyVal -AnyVal +AnyVal Matchable -Matchable +Matchable @@ -31,7 +31,7 @@ AnyRef / Object -AnyRef / Object +AnyRef / Object @@ -43,7 +43,7 @@ Unit -Unit +Unit @@ -55,7 +55,7 @@ Boolean -Boolean +Boolean @@ -67,7 +67,7 @@ Int -Int +Int @@ -79,7 +79,7 @@ ... (value types) -... (value types) +... (value types) @@ -91,7 +91,7 @@ String -String +String @@ -103,7 +103,7 @@ List[Int] -List[Int] +List[Int] @@ -115,7 +115,7 @@ ... (reference types) -... (reference types) +... (reference types) @@ -127,7 +127,7 @@ Any -Any +Any @@ -139,7 +139,7 @@ Null -Null +Null @@ -163,7 +163,7 @@ Nothing -Nothing +Nothing