diff --git a/css/base.less b/css/base.less index 71b9ef6..ca77f34 100755 --- a/css/base.less +++ b/css/base.less @@ -5,8 +5,8 @@ /* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */ /* global vars */ /* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */ -@font_family_screen: arial, sans-serif; -@font_family_print: "Times New Roman", serif; +@font_family_screen: "Roboto Slab", arial, sans-serif; +@font_family_print: "Roboto Slab", arial, sans-serif; @nav_direct_background: @ini_background; @nav_direct_color: @ini_existing; diff --git a/css/base_design.less b/css/base_design.less index fe33574..560e5eb 100755 --- a/css/base_design.less +++ b/css/base_design.less @@ -500,7 +500,7 @@ pre, code, samp, kbd { - font-family: Consolas, "Andale Mono WT", "Andale Mono", "Bitstream Vera Sans Mono", "Nimbus Mono L", Monaco, "Courier New", monospace; + font-family: "Courier Prime", "Courier New", Consolas, "Andale Mono WT", "Andale Mono", "Bitstream Vera Sans Mono", "Nimbus Mono L", Monaco, monospace; /* same font stack should be used for ".dokuwiki table.diff td" in _diff.css */ font-size: @font-size-default; direction: ltr; diff --git a/css/base_mixins.less b/css/base_mixins.less index 6d3b840..1e0ea44 100755 --- a/css/base_mixins.less +++ b/css/base_mixins.less @@ -25,6 +25,60 @@ } } +/* roboto-slab-regular - cyrillic_cyrillic-ext_greek_greek-ext_latin_latin-ext */ +@font-face { + font-display: swap; /* Check https://developer.mozilla.org/en-US/docs/Web/CSS/@font-face/font-display for other options. */ + font-family: 'Roboto Slab'; + font-style: normal; + font-weight: 400; + src: url('fonts/roboto-slab-v36-cyrillic_cyrillic-ext_greek_greek-ext_latin_latin-ext-regular.woff2') format('woff2'); /* Chrome 36+, Opera 23+, Firefox 39+, Safari 12+, iOS 10+ */ +} + +/* roboto-slab-700 - cyrillic_cyrillic-ext_greek_greek-ext_latin_latin-ext */ +@font-face { + font-display: swap; /* Check https://developer.mozilla.org/en-US/docs/Web/CSS/@font-face/font-display for other options. */ + font-family: 'Roboto Slab'; + font-style: normal; + font-weight: 700; + src: url('fonts/roboto-slab-v36-cyrillic_cyrillic-ext_greek_greek-ext_latin_latin-ext-700.woff2') format('woff2'); /* Chrome 36+, Opera 23+, Firefox 39+, Safari 12+, iOS 10+ */ +} + +/* courier-prime-regular - latin */ +@font-face { + font-display: swap; /* Check https://developer.mozilla.org/en-US/docs/Web/CSS/@font-face/font-display for other options. */ + font-family: 'Courier Prime'; + font-style: normal; + font-weight: 400; + src: url('fonts/courier-prime-v11-latin-regular.woff2') format('woff2'); /* Chrome 36+, Opera 23+, Firefox 39+, Safari 12+, iOS 10+ */ +} + +/* courier-prime-italic - latin */ +@font-face { + font-display: swap; /* Check https://developer.mozilla.org/en-US/docs/Web/CSS/@font-face/font-display for other options. */ + font-family: 'Courier Prime'; + font-style: italic; + font-weight: 400; + src: url('fonts/courier-prime-v11-latin-italic.woff2') format('woff2'); /* Chrome 36+, Opera 23+, Firefox 39+, Safari 12+, iOS 10+ */ +} + +/* courier-prime-700 - latin */ +@font-face { + font-display: swap; /* Check https://developer.mozilla.org/en-US/docs/Web/CSS/@font-face/font-display for other options. */ + font-family: 'Courier Prime'; + font-style: normal; + font-weight: 700; + src: url('fonts/courier-prime-v11-latin-700.woff2') format('woff2'); /* Chrome 36+, Opera 23+, Firefox 39+, Safari 12+, iOS 10+ */ +} + +/* courier-prime-700italic - latin */ +@font-face { + font-display: swap; /* Check https://developer.mozilla.org/en-US/docs/Web/CSS/@font-face/font-display for other options. */ + font-family: 'Courier Prime'; + font-style: italic; + font-weight: 700; + src: url('fonts/courier-prime-v11-latin-700italic.woff2') format('woff2'); /* Chrome 36+, Opera 23+, Firefox 39+, Safari 12+, iOS 10+ */ +} + .fontello() { &::before { font-family: "fontello"; diff --git a/fonts/courier-prime-v11-latin-700.woff2 b/fonts/courier-prime-v11-latin-700.woff2 new file mode 100644 index 0000000..2d36acc Binary files /dev/null and b/fonts/courier-prime-v11-latin-700.woff2 differ diff --git a/fonts/courier-prime-v11-latin-700italic.woff2 b/fonts/courier-prime-v11-latin-700italic.woff2 new file mode 100644 index 0000000..4bf1fb6 Binary files /dev/null and b/fonts/courier-prime-v11-latin-700italic.woff2 differ diff --git a/fonts/courier-prime-v11-latin-italic.woff2 b/fonts/courier-prime-v11-latin-italic.woff2 new file mode 100644 index 0000000..da0d87c Binary files /dev/null and b/fonts/courier-prime-v11-latin-italic.woff2 differ diff --git a/fonts/courier-prime-v11-latin-regular.woff2 b/fonts/courier-prime-v11-latin-regular.woff2 new file mode 100644 index 0000000..42dadfe Binary files /dev/null and b/fonts/courier-prime-v11-latin-regular.woff2 differ diff --git a/fonts/roboto-slab-v36-cyrillic_cyrillic-ext_greek_greek-ext_latin_latin-ext-700.woff2 b/fonts/roboto-slab-v36-cyrillic_cyrillic-ext_greek_greek-ext_latin_latin-ext-700.woff2 new file mode 100644 index 0000000..0edf2f7 Binary files /dev/null and b/fonts/roboto-slab-v36-cyrillic_cyrillic-ext_greek_greek-ext_latin_latin-ext-700.woff2 differ diff --git a/fonts/roboto-slab-v36-cyrillic_cyrillic-ext_greek_greek-ext_latin_latin-ext-regular.woff2 b/fonts/roboto-slab-v36-cyrillic_cyrillic-ext_greek_greek-ext_latin_latin-ext-regular.woff2 new file mode 100644 index 0000000..f55bf37 Binary files /dev/null and b/fonts/roboto-slab-v36-cyrillic_cyrillic-ext_greek_greek-ext_latin_latin-ext-regular.woff2 differ