diff --git a/themes/marat/static/css/marat.css b/themes/marat/static/css/marat.css index e6ebb10..514e2ab 100644 --- a/themes/marat/static/css/marat.css +++ b/themes/marat/static/css/marat.css @@ -1,49 +1,35 @@ -/* ibm-plex-sans-regular - latin */ +/* fira-sans-regular - latin */ @font-face { - font-family: 'IBM Plex Sans'; + font-family: 'Fira Sans'; font-style: normal; font-weight: 400; - src: url('/theme/fonts/ibm-plex-sans-v5-latin-regular.eot'); /* IE9 Compat Modes */ - src: local('IBM Plex Sans'), local('IBMPlexSans'), - url('/theme/fonts/ibm-plex-sans-v5-latin-regular.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ - url('/theme/fonts/ibm-plex-sans-v5-latin-regular.woff2') format('woff2'), /* Super Modern Browsers */ - url('/theme/fonts/ibm-plex-sans-v5-latin-regular.woff') format('woff'), /* Modern Browsers */ - url('/theme/fonts/ibm-plex-sans-v5-latin-regular.ttf') format('truetype'), /* Safari, Android, iOS */ - url('/theme/fonts/ibm-plex-sans-v5-latin-regular.svg#IBMPlexSans') format('svg'); /* Legacy iOS */ + src: url('/theme/fonts/fira-sans-v9-latin-regular.eot'); /* IE9 Compat Modes */ + src: local('Fira Sans Regular'), local('FiraSans-Regular'), + url('/theme/fonts/fira-sans-v9-latin-regular.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ + url('/theme/fonts/fira-sans-v9-latin-regular.woff2') format('woff2'), /* Super Modern Browsers */ + url('/theme/fonts/fira-sans-v9-latin-regular.woff') format('woff'), /* Modern Browsers */ + url('/theme/fonts/fira-sans-v9-latin-regular.ttf') format('truetype'), /* Safari, Android, iOS */ + url('/theme/fonts/fira-sans-v9-latin-regular.svg#FiraSans') format('svg'); /* Legacy iOS */ } -/* ibm-plex-serif-italic - latin */ +/* fira-mono-regular - latin */ @font-face { - font-family: 'IBM Plex Serif'; - font-style: italic; - font-weight: 400; - src: url('/theme/fonts/ibm-plex-serif-v6-latin-italic.eot'); /* IE9 Compat Modes */ - src: local('IBM Plex Serif Italic'), local('IBMPlexSerif-Italic'), - url('/theme/fonts/ibm-plex-serif-v6-latin-italic.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ - url('/theme/fonts/ibm-plex-serif-v6-latin-italic.woff2') format('woff2'), /* Super Modern Browsers */ - url('/theme/fonts/ibm-plex-serif-v6-latin-italic.woff') format('woff'), /* Modern Browsers */ - url('/theme/fonts/ibm-plex-serif-v6-latin-italic.ttf') format('truetype'), /* Safari, Android, iOS */ - url('/theme/fonts/ibm-plex-serif-v6-latin-italic.svg#IBMPlexSerif') format('svg'); /* Legacy iOS */ -} - -/* ibm-plex-mono-regular - latin */ -@font-face { - font-family: 'IBM Plex Mono'; + font-family: 'Fira Mono'; font-style: normal; font-weight: 400; - src: url('/theme/fonts/ibm-plex-mono-v4-latin-regular.eot'); /* IE9 Compat Modes */ - src: local('IBM Plex Mono'), local('IBMPlexMono'), - url('/theme/fonts/ibm-plex-mono-v4-latin-regular.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ - url('/theme/fonts/ibm-plex-mono-v4-latin-regular.woff2') format('woff2'), /* Super Modern Browsers */ - url('/theme/fonts/ibm-plex-mono-v4-latin-regular.woff') format('woff'), /* Modern Browsers */ - url('/theme/fonts/ibm-plex-mono-v4-latin-regular.ttf') format('truetype'), /* Safari, Android, iOS */ - url('/theme/fonts/ibm-plex-mono-v4-latin-regular.svg#IBMPlexMono') format('svg'); /* Legacy iOS */ + src: url('/theme/fonts/fira-mono-v7-latin-regular.eot'); /* IE9 Compat Modes */ + src: local('Fira Mono Regular'), local('FiraMono-Regular'), + url('/theme/fonts/fira-mono-v7-latin-regular.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ + url('/theme/fonts/fira-mono-v7-latin-regular.woff2') format('woff2'), /* Super Modern Browsers */ + url('/theme/fonts/fira-mono-v7-latin-regular.woff') format('woff'), /* Modern Browsers */ + url('/theme/fonts/fira-mono-v7-latin-regular.ttf') format('truetype'), /* Safari, Android, iOS */ + url('/theme/fonts/fira-mono-v7-latin-regular.svg#FiraMono') format('svg'); /* Legacy iOS */ } body { background: #ffffff; height: 100%; - font-family: 'IBM Plex Sans'; + font-family: 'Fira Sans'; font-style: normal; font-size: 1.5em; } @@ -59,7 +45,7 @@ a:hover { h1 { color: #000000; margin-top: 75px; - font-family: 'IBM Plex Serif'; + font-family: 'Fira Sans'; } h1 a { @@ -68,7 +54,7 @@ h1 a { h2 { color: #000000; - font-family: 'IBM Plex Serif'; + font-family: 'Fira Sans'; } hr { @@ -104,11 +90,11 @@ figcaption { .content pre { padding: 20px; - font-family: "IBM Plex Mono"; + font-family: "Fira Mono"; } .content blockquote { - font-family: "IBM Plex Serif"; + font-family: "Fira Sans"; font-size: 1.5em; } @@ -117,12 +103,12 @@ figcaption { } #tipue_search_input { - font-family: 'IBM Plex Sans'; + font-family: 'Fira Sans'; padding: 0px; } #tipue_search_results_count, .tipue_search_content_title a, .tipue_search_content_url a, .tipue_search_content_text, #tipue_search_warning { - font-family: 'IBM Plex Sans'; + font-family: 'Fira Sans'; } .tipue_search_content_title a, .tipue_search_content_url a { diff --git a/themes/marat/static/fonts/fira-mono-v7-latin-regular.eot b/themes/marat/static/fonts/fira-mono-v7-latin-regular.eot new file mode 100644 index 0000000..9d33ae0 Binary files /dev/null and b/themes/marat/static/fonts/fira-mono-v7-latin-regular.eot differ diff --git a/themes/marat/static/fonts/fira-mono-v7-latin-regular.svg b/themes/marat/static/fonts/fira-mono-v7-latin-regular.svg new file mode 100644 index 0000000..8dd1442 --- /dev/null +++ b/themes/marat/static/fonts/fira-mono-v7-latin-regular.svg @@ -0,0 +1,322 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/themes/marat/static/fonts/fira-mono-v7-latin-regular.ttf b/themes/marat/static/fonts/fira-mono-v7-latin-regular.ttf new file mode 100644 index 0000000..feeeb34 Binary files /dev/null and b/themes/marat/static/fonts/fira-mono-v7-latin-regular.ttf differ diff --git a/themes/marat/static/fonts/fira-mono-v7-latin-regular.woff b/themes/marat/static/fonts/fira-mono-v7-latin-regular.woff new file mode 100644 index 0000000..0c32bb9 Binary files /dev/null and b/themes/marat/static/fonts/fira-mono-v7-latin-regular.woff differ diff --git a/themes/marat/static/fonts/fira-mono-v7-latin-regular.woff2 b/themes/marat/static/fonts/fira-mono-v7-latin-regular.woff2 new file mode 100644 index 0000000..93eeae9 Binary files /dev/null and b/themes/marat/static/fonts/fira-mono-v7-latin-regular.woff2 differ diff --git a/themes/marat/static/fonts/fira-sans-v9-latin-regular.eot b/themes/marat/static/fonts/fira-sans-v9-latin-regular.eot new file mode 100644 index 0000000..7abf4c2 Binary files /dev/null and b/themes/marat/static/fonts/fira-sans-v9-latin-regular.eot differ diff --git a/themes/marat/static/fonts/fira-sans-v9-latin-regular.svg b/themes/marat/static/fonts/fira-sans-v9-latin-regular.svg new file mode 100644 index 0000000..1e52097 --- /dev/null +++ b/themes/marat/static/fonts/fira-sans-v9-latin-regular.svg @@ -0,0 +1,330 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/themes/marat/static/fonts/fira-sans-v9-latin-regular.ttf b/themes/marat/static/fonts/fira-sans-v9-latin-regular.ttf new file mode 100644 index 0000000..572e442 Binary files /dev/null and b/themes/marat/static/fonts/fira-sans-v9-latin-regular.ttf differ diff --git a/themes/marat/static/fonts/fira-sans-v9-latin-regular.woff b/themes/marat/static/fonts/fira-sans-v9-latin-regular.woff new file mode 100644 index 0000000..d99ba57 Binary files /dev/null and b/themes/marat/static/fonts/fira-sans-v9-latin-regular.woff differ diff --git a/themes/marat/static/fonts/fira-sans-v9-latin-regular.woff2 b/themes/marat/static/fonts/fira-sans-v9-latin-regular.woff2 new file mode 100644 index 0000000..9bb5760 Binary files /dev/null and b/themes/marat/static/fonts/fira-sans-v9-latin-regular.woff2 differ diff --git a/themes/marat/static/fonts/ibm-plex-mono-v4-latin-regular.eot b/themes/marat/static/fonts/ibm-plex-mono-v4-latin-regular.eot deleted file mode 100644 index dcb754c..0000000 Binary files a/themes/marat/static/fonts/ibm-plex-mono-v4-latin-regular.eot and /dev/null differ diff --git a/themes/marat/static/fonts/ibm-plex-mono-v4-latin-regular.svg b/themes/marat/static/fonts/ibm-plex-mono-v4-latin-regular.svg deleted file mode 100644 index cb20dd7..0000000 --- a/themes/marat/static/fonts/ibm-plex-mono-v4-latin-regular.svg +++ /dev/null @@ -1,329 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/themes/marat/static/fonts/ibm-plex-mono-v4-latin-regular.ttf b/themes/marat/static/fonts/ibm-plex-mono-v4-latin-regular.ttf deleted file mode 100644 index ae2d654..0000000 Binary files a/themes/marat/static/fonts/ibm-plex-mono-v4-latin-regular.ttf and /dev/null differ diff --git a/themes/marat/static/fonts/ibm-plex-mono-v4-latin-regular.woff b/themes/marat/static/fonts/ibm-plex-mono-v4-latin-regular.woff deleted file mode 100644 index 000a393..0000000 Binary files a/themes/marat/static/fonts/ibm-plex-mono-v4-latin-regular.woff and /dev/null differ diff --git a/themes/marat/static/fonts/ibm-plex-mono-v4-latin-regular.woff2 b/themes/marat/static/fonts/ibm-plex-mono-v4-latin-regular.woff2 deleted file mode 100644 index cbe17a3..0000000 Binary files a/themes/marat/static/fonts/ibm-plex-mono-v4-latin-regular.woff2 and /dev/null differ diff --git a/themes/marat/static/fonts/ibm-plex-sans-v5-latin-regular.eot b/themes/marat/static/fonts/ibm-plex-sans-v5-latin-regular.eot deleted file mode 100644 index 1632987..0000000 Binary files a/themes/marat/static/fonts/ibm-plex-sans-v5-latin-regular.eot and /dev/null differ diff --git a/themes/marat/static/fonts/ibm-plex-sans-v5-latin-regular.svg b/themes/marat/static/fonts/ibm-plex-sans-v5-latin-regular.svg deleted file mode 100644 index a095d4a..0000000 --- a/themes/marat/static/fonts/ibm-plex-sans-v5-latin-regular.svg +++ /dev/null @@ -1,339 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/themes/marat/static/fonts/ibm-plex-sans-v5-latin-regular.ttf b/themes/marat/static/fonts/ibm-plex-sans-v5-latin-regular.ttf deleted file mode 100644 index b83a180..0000000 Binary files a/themes/marat/static/fonts/ibm-plex-sans-v5-latin-regular.ttf and /dev/null differ diff --git a/themes/marat/static/fonts/ibm-plex-sans-v5-latin-regular.woff b/themes/marat/static/fonts/ibm-plex-sans-v5-latin-regular.woff deleted file mode 100644 index 24cbb7d..0000000 Binary files a/themes/marat/static/fonts/ibm-plex-sans-v5-latin-regular.woff and /dev/null differ diff --git a/themes/marat/static/fonts/ibm-plex-sans-v5-latin-regular.woff2 b/themes/marat/static/fonts/ibm-plex-sans-v5-latin-regular.woff2 deleted file mode 100644 index 1c11337..0000000 Binary files a/themes/marat/static/fonts/ibm-plex-sans-v5-latin-regular.woff2 and /dev/null differ diff --git a/themes/marat/static/fonts/ibm-plex-serif-v6-latin-italic.eot b/themes/marat/static/fonts/ibm-plex-serif-v6-latin-italic.eot deleted file mode 100644 index d843c48..0000000 Binary files a/themes/marat/static/fonts/ibm-plex-serif-v6-latin-italic.eot and /dev/null differ diff --git a/themes/marat/static/fonts/ibm-plex-serif-v6-latin-italic.svg b/themes/marat/static/fonts/ibm-plex-serif-v6-latin-italic.svg deleted file mode 100644 index babbf98..0000000 --- a/themes/marat/static/fonts/ibm-plex-serif-v6-latin-italic.svg +++ /dev/null @@ -1,418 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/themes/marat/static/fonts/ibm-plex-serif-v6-latin-italic.ttf b/themes/marat/static/fonts/ibm-plex-serif-v6-latin-italic.ttf deleted file mode 100644 index 1209243..0000000 Binary files a/themes/marat/static/fonts/ibm-plex-serif-v6-latin-italic.ttf and /dev/null differ diff --git a/themes/marat/static/fonts/ibm-plex-serif-v6-latin-italic.woff b/themes/marat/static/fonts/ibm-plex-serif-v6-latin-italic.woff deleted file mode 100644 index 629800f..0000000 Binary files a/themes/marat/static/fonts/ibm-plex-serif-v6-latin-italic.woff and /dev/null differ diff --git a/themes/marat/static/fonts/ibm-plex-serif-v6-latin-italic.woff2 b/themes/marat/static/fonts/ibm-plex-serif-v6-latin-italic.woff2 deleted file mode 100644 index 7c2f824..0000000 Binary files a/themes/marat/static/fonts/ibm-plex-serif-v6-latin-italic.woff2 and /dev/null differ