diff --git a/_sass/components/code.scss b/_sass/components/code.scss index dd2ce04b7..821cc3058 100755 --- a/_sass/components/code.scss +++ b/_sass/components/code.scss @@ -174,7 +174,7 @@ code { // style that would be injected by hljs when JS is enabled display: block; - font-family: 'Consolas', monospace; + font-family: 'Inconsolata', monospace; border: none; display: block; overflow-x: auto; diff --git a/_sass/layout/type-md.scss b/_sass/layout/type-md.scss index 2e390b7e5..7a779f72c 100755 --- a/_sass/layout/type-md.scss +++ b/_sass/layout/type-md.scss @@ -151,7 +151,7 @@ li, p { code { - font-family: 'Consolas', monospace; + font-family: 'Inconsolata', monospace; background-color: #fff; color: #859900; @include border-radius($border-radius-medium); diff --git a/_sass/vendors/bourbon/addons/_font-stacks.scss b/_sass/vendors/bourbon/addons/_font-stacks.scss index 57128f422..351f5df5f 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 1db8a26ed..acbdceed9 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 67e622e26..415ae53e4 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 198111964..000000000 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 231576b0e..000000000 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 1899dbd06..000000000 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 107dc0bef..000000000 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 2a98047bd..000000000 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 828c0282d..000000000 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 deeed9367..000000000 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 9966bed49..000000000 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 9828b0da8..000000000 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 3506f34f1..000000000 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 743cbfaf1..000000000 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 6078102f8..000000000 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 000000000..7e9e39ac3 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 000000000..6036377d3 Binary files /dev/null and b/resources/glyphs/Inconsolata_SemiExpanded-SemiBold.ttf differ