diff --git a/fonts/Consolas.Bold.Italic.ttf b/fonts/Consolas.Bold.Italic.ttf deleted file mode 100755 index e457c6d..0000000 Binary files a/fonts/Consolas.Bold.Italic.ttf and /dev/null differ diff --git a/fonts/Consolas.Bold.ttf b/fonts/Consolas.Bold.ttf deleted file mode 100755 index 30b069c..0000000 Binary files a/fonts/Consolas.Bold.ttf and /dev/null differ diff --git a/fonts/Consolas.Italic.ttf b/fonts/Consolas.Italic.ttf deleted file mode 100755 index 1661878..0000000 Binary files a/fonts/Consolas.Italic.ttf and /dev/null differ diff --git a/fonts/Consolas.ttf b/fonts/Consolas.ttf deleted file mode 100755 index 1d67e79..0000000 Binary files a/fonts/Consolas.ttf and /dev/null differ diff --git a/fonts/DejaVuSansMono.Bold.Italic.ttf b/fonts/DejaVuSansMono.Bold.Italic.ttf new file mode 100644 index 0000000..9070783 Binary files /dev/null and b/fonts/DejaVuSansMono.Bold.Italic.ttf differ diff --git a/fonts/DejaVuSansMono.Bold.ttf b/fonts/DejaVuSansMono.Bold.ttf new file mode 100644 index 0000000..a6ff5aa Binary files /dev/null and b/fonts/DejaVuSansMono.Bold.ttf differ diff --git a/fonts/DejaVuSansMono.Italic.ttf b/fonts/DejaVuSansMono.Italic.ttf new file mode 100644 index 0000000..734e0be Binary files /dev/null and b/fonts/DejaVuSansMono.Italic.ttf differ diff --git a/fonts/DejaVuSansMono.ttf b/fonts/DejaVuSansMono.ttf new file mode 100644 index 0000000..f7d2785 Binary files /dev/null and b/fonts/DejaVuSansMono.ttf differ diff --git a/index.htm b/index.htm index 3b4f4b9..13951a6 100755 --- a/index.htm +++ b/index.htm @@ -82,7 +82,7 @@
<html lang="en-US">
<head>
-<title>Shower</title>
+<title>Кириллица</title>
<meta charset="UTF-8">
<link rel="stylesheet" href="s/screen.css">
<script src="j/jquery.js"></script>
diff --git a/styles/fonts.css b/styles/fonts.css index 246f176..d4aa125 100755 --- a/styles/fonts.css +++ b/styles/fonts.css @@ -1,61 +1,61 @@ /* PTSans */ @font-face { - font-family:'PTSans'; - src:local('PTSans'), url(../fonts/PTSans.ttf) format('truetype'); + font-family:'PT Sans'; + src:local('PT Sans'), url(../fonts/PTSans.ttf) format('truetype'); } @font-face { - font-family:'PTSans'; + font-family:'PT Sans'; font-weight:bold; - src:local('PTSans'), url(../fonts/PTSans.Bold.ttf) format('truetype'); + src:local('PT Sans Bold'), url(../fonts/PTSans.Bold.ttf) format('truetype'); } @font-face { - font-family:'PTSans'; + font-family:'PT Sans'; font-style:italic; - src:local('PTSans'), url(../fonts/PTSans.Italic.ttf) format('truetype'); + src:local('PT Sans Italic'), url(../fonts/PTSans.Italic.ttf) format('truetype'); } @font-face { - font-family:'PTSans'; + font-family:'PT Sans'; font-weight:bold; font-style:italic; - src:local('PTSans'), url(../fonts/PTSans.Bold.Italic.ttf) format('truetype'); + src:local('PT Sans Bold Italic'), url(../fonts/PTSans.Bold.Italic.ttf) format('truetype'); } @font-face { - font-family:'PTSans Caption'; - src:local('PTSans'), url(../fonts/PTSans.Caption.ttf) format('truetype'); + font-family:'PT Sans Caption'; + src:local('PT Sans Caption'), url(../fonts/PTSans.Caption.ttf) format('truetype'); } @font-face { - font-family:'PTSans Caption'; + font-family:'PT Sans Caption'; font-weight:bold; - src:local('PTSans Caption'), url(../fonts/PTSans.Caption.Bold.ttf) format('truetype'); + src:local('PT Sans Caption Bold'), url(../fonts/PTSans.Caption.Bold.ttf) format('truetype'); } @font-face { - font-family:'PTSans Narrow'; - src:local('PTSans Narrow'), url(../fonts/PTSans.Narrow.ttf) format('truetype'); + font-family:'PT Sans Narrow'; + src:local('PT Sans Narrow'), url(../fonts/PTSans.Narrow.ttf) format('truetype'); } @font-face { - font-family:'PTSans Narrow'; + font-family:'PT Sans Narrow'; font-weight:bold; - src:local('PTSans Narrow'), url(../fonts/PTSans.Narrow.Bold.ttf) format('truetype'); + src:local('PT Sans Narrow Bold'), url(../fonts/PTSans.Narrow.Bold.ttf) format('truetype'); } -/* Consolas */ +/* DejaVu Sans Mono */ @font-face { - font-family:'Consolas'; - src:local('Consolas'), url(../fonts/Consolas.ttf) format('truetype'); + font-family:'DejaVu Sans Mono'; + src:local('DejaVu Sans Mono'), url(../fonts/DejaVuSansMono.ttf) format('truetype'); } @font-face { - font-family:'Consolas'; + font-family:'DejaVu Sans Mono'; font-weight:bold; - src:local('Consolas'), url(../fonts/Consolas.Bold.ttf) format('truetype'); + src:local('DejaVu Sans Mono Bold'), url(../fonts/DejaVuSansMono.Bold.ttf) format('truetype'); } @font-face { - font-family:'Consolas'; + font-family:'DejaVu Sans Mono'; font-style:italic; - src:local('Consolas'), url(../fonts/Consolas.Italic.ttf) format('truetype'); + src:local('DejaVu Sans Mono Oblique'), url(../fonts/DejaVuSansMono.Italic.ttf) format('truetype'); } @font-face { - font-family:'Consolas'; + font-family:'DejaVu Sans Mono'; font-weight:bold; font-style:italic; - src:local('Consolas'), url(../fonts/Consolas.Bold.Italic.ttf) format('truetype'); + src:local('DejaVu Sans Mono Bold Oblique'), url(../fonts/DejaVuSansMono.Bold.Italic.ttf) format('truetype'); } \ No newline at end of file diff --git a/styles/projection.css b/styles/projection.css index 096de3b..6ad79eb 100755 --- a/styles/projection.css +++ b/styles/projection.css @@ -4,7 +4,7 @@ BODY { background:#000; color:#FFF; - font:1em 'PTSans', sans-serif; + font:1em 'PT Sans', sans-serif; counter-reset:paging; } A { @@ -81,7 +81,7 @@ A { .slide ARTICLE H2 { margin:0 0 1.2em; color:#666; - font:bold 1em/1.2 'PTSans Narrow', sans-serif; + font:bold 1em/1.2 'PT Sans Narrow', sans-serif; } .slide ARTICLE P { margin:0 0 1.7em;