From: cain-ish Date: Mon, 15 Feb 2016 14:53:59 +0000 (+0100) Subject: Font fix X-Git-Url: https://git.mdrn.pl/wolnelektury.git/commitdiff_plain/527055abe52213eebc02175dd192841966735e18?ds=sidebyside;hp=4d40d1dc355776bb02fe0c622aa52cc3f396673c Font fix --- diff --git a/src/wolnelektury/static/fonts/cousine/v10/0IpceuvDvCegpU9Mz8MQ_g.woff2 b/src/wolnelektury/static/fonts/cousine/v10/0IpceuvDvCegpU9Mz8MQ_g.woff2 new file mode 100644 index 000000000..f8b755d04 Binary files /dev/null and b/src/wolnelektury/static/fonts/cousine/v10/0IpceuvDvCegpU9Mz8MQ_g.woff2 differ diff --git a/src/wolnelektury/static/fonts/cousine/v10/0VdvlOBfHobA4eW-NVYk-VtXRa8TVwTICgirnJhmVJw.woff2 b/src/wolnelektury/static/fonts/cousine/v10/0VdvlOBfHobA4eW-NVYk-VtXRa8TVwTICgirnJhmVJw.woff2 new file mode 100644 index 000000000..332cb4d22 Binary files /dev/null and b/src/wolnelektury/static/fonts/cousine/v10/0VdvlOBfHobA4eW-NVYk-VtXRa8TVwTICgirnJhmVJw.woff2 differ diff --git a/src/wolnelektury/static/fonts/cousine/v10/4OFqQVT4CccEiwAQMKv0eiEAvth_LlrfE80CYdSH47w.woff2 b/src/wolnelektury/static/fonts/cousine/v10/4OFqQVT4CccEiwAQMKv0eiEAvth_LlrfE80CYdSH47w.woff2 new file mode 100644 index 000000000..a28674f88 Binary files /dev/null and b/src/wolnelektury/static/fonts/cousine/v10/4OFqQVT4CccEiwAQMKv0eiEAvth_LlrfE80CYdSH47w.woff2 differ diff --git a/src/wolnelektury/static/fonts/cousine/v10/Bt5Lz7Saa5a5RtsafP9xmfY6323mHUZFJMgTvxaG2iE.woff2 b/src/wolnelektury/static/fonts/cousine/v10/Bt5Lz7Saa5a5RtsafP9xmfY6323mHUZFJMgTvxaG2iE.woff2 new file mode 100644 index 000000000..0fa7222ca Binary files /dev/null and b/src/wolnelektury/static/fonts/cousine/v10/Bt5Lz7Saa5a5RtsafP9xmfY6323mHUZFJMgTvxaG2iE.woff2 differ diff --git a/src/wolnelektury/static/fonts/cousine/v10/IYQIfrNvkAhlEkaWqzgTm_Y6323mHUZFJMgTvxaG2iE.woff2 b/src/wolnelektury/static/fonts/cousine/v10/IYQIfrNvkAhlEkaWqzgTm_Y6323mHUZFJMgTvxaG2iE.woff2 new file mode 100644 index 000000000..f6ecbfb28 Binary files /dev/null and b/src/wolnelektury/static/fonts/cousine/v10/IYQIfrNvkAhlEkaWqzgTm_Y6323mHUZFJMgTvxaG2iE.woff2 differ diff --git a/src/wolnelektury/static/fonts/cousine/v10/JHq2r7PZMuzGPtEvdlprZCEAvth_LlrfE80CYdSH47w.woff2 b/src/wolnelektury/static/fonts/cousine/v10/JHq2r7PZMuzGPtEvdlprZCEAvth_LlrfE80CYdSH47w.woff2 new file mode 100644 index 000000000..6c954b1f9 Binary files /dev/null and b/src/wolnelektury/static/fonts/cousine/v10/JHq2r7PZMuzGPtEvdlprZCEAvth_LlrfE80CYdSH47w.woff2 differ diff --git a/src/wolnelektury/static/fonts/cousine/v10/XkYjaL8YjqL9qW8o0T14ufk_vArhqVIZ0nv9q090hN8.woff2 b/src/wolnelektury/static/fonts/cousine/v10/XkYjaL8YjqL9qW8o0T14ufk_vArhqVIZ0nv9q090hN8.woff2 new file mode 100644 index 000000000..843326b73 Binary files /dev/null and b/src/wolnelektury/static/fonts/cousine/v10/XkYjaL8YjqL9qW8o0T14ufk_vArhqVIZ0nv9q090hN8.woff2 differ diff --git a/src/wolnelektury/static/fonts/cousine/v10/aWxnkwXsEJCSg-HKkPTCkBJtnKITppOI_IvcXXDNrsc.woff2 b/src/wolnelektury/static/fonts/cousine/v10/aWxnkwXsEJCSg-HKkPTCkBJtnKITppOI_IvcXXDNrsc.woff2 new file mode 100644 index 000000000..a22489173 Binary files /dev/null and b/src/wolnelektury/static/fonts/cousine/v10/aWxnkwXsEJCSg-HKkPTCkBJtnKITppOI_IvcXXDNrsc.woff2 differ diff --git a/src/wolnelektury/static/fonts/cousine/v10/auteuWVL5GjOhekECAkC_SEAvth_LlrfE80CYdSH47w.woff2 b/src/wolnelektury/static/fonts/cousine/v10/auteuWVL5GjOhekECAkC_SEAvth_LlrfE80CYdSH47w.woff2 new file mode 100644 index 000000000..8b6e83aa7 Binary files /dev/null and b/src/wolnelektury/static/fonts/cousine/v10/auteuWVL5GjOhekECAkC_SEAvth_LlrfE80CYdSH47w.woff2 differ diff --git a/src/wolnelektury/static/fonts/cousine/v10/bS4Fjp2fQa3pRrzTYB6CXhJtnKITppOI_IvcXXDNrsc.woff2 b/src/wolnelektury/static/fonts/cousine/v10/bS4Fjp2fQa3pRrzTYB6CXhJtnKITppOI_IvcXXDNrsc.woff2 new file mode 100644 index 000000000..0e94d0ab3 Binary files /dev/null and b/src/wolnelektury/static/fonts/cousine/v10/bS4Fjp2fQa3pRrzTYB6CXhJtnKITppOI_IvcXXDNrsc.woff2 differ diff --git a/src/wolnelektury/static/fonts/cousine/v10/qjsoqLzZoDyy_opKVvy-uvY6323mHUZFJMgTvxaG2iE.woff2 b/src/wolnelektury/static/fonts/cousine/v10/qjsoqLzZoDyy_opKVvy-uvY6323mHUZFJMgTvxaG2iE.woff2 new file mode 100644 index 000000000..7169258d9 Binary files /dev/null and b/src/wolnelektury/static/fonts/cousine/v10/qjsoqLzZoDyy_opKVvy-uvY6323mHUZFJMgTvxaG2iE.woff2 differ diff --git a/src/wolnelektury/static/fonts/cousine/v10/svY-0AsqnhB5pNHScPRpHhJtnKITppOI_IvcXXDNrsc.woff2 b/src/wolnelektury/static/fonts/cousine/v10/svY-0AsqnhB5pNHScPRpHhJtnKITppOI_IvcXXDNrsc.woff2 new file mode 100644 index 000000000..edf7a5a3f Binary files /dev/null and b/src/wolnelektury/static/fonts/cousine/v10/svY-0AsqnhB5pNHScPRpHhJtnKITppOI_IvcXXDNrsc.woff2 differ diff --git a/src/wolnelektury/static/fonts/cousine/v10/y_AZ5Sz-FwL1lux2xLSTZT0LW-43aMEzIO6XUTLjad8.woff2 b/src/wolnelektury/static/fonts/cousine/v10/y_AZ5Sz-FwL1lux2xLSTZT0LW-43aMEzIO6XUTLjad8.woff2 new file mode 100644 index 000000000..c1c1d84be Binary files /dev/null and b/src/wolnelektury/static/fonts/cousine/v10/y_AZ5Sz-FwL1lux2xLSTZT0LW-43aMEzIO6XUTLjad8.woff2 differ diff --git a/src/wolnelektury/static/fonts/cousine/v10/y_AZ5Sz-FwL1lux2xLSTZZX5f-9o1vgP2EXwfjgl7AY.woff2 b/src/wolnelektury/static/fonts/cousine/v10/y_AZ5Sz-FwL1lux2xLSTZZX5f-9o1vgP2EXwfjgl7AY.woff2 new file mode 100644 index 000000000..96d590733 Binary files /dev/null and b/src/wolnelektury/static/fonts/cousine/v10/y_AZ5Sz-FwL1lux2xLSTZZX5f-9o1vgP2EXwfjgl7AY.woff2 differ diff --git a/src/wolnelektury/static/fonts/cousine/v10/y_AZ5Sz-FwL1lux2xLSTZa-j2U0lmluP9RWlSytm3ho.woff2 b/src/wolnelektury/static/fonts/cousine/v10/y_AZ5Sz-FwL1lux2xLSTZa-j2U0lmluP9RWlSytm3ho.woff2 new file mode 100644 index 000000000..6a3ad1a95 Binary files /dev/null and b/src/wolnelektury/static/fonts/cousine/v10/y_AZ5Sz-FwL1lux2xLSTZa-j2U0lmluP9RWlSytm3ho.woff2 differ diff --git a/src/wolnelektury/static/fonts/cousine/v10/y_AZ5Sz-FwL1lux2xLSTZegdm0LZdjqr5-oayXSOefg.woff2 b/src/wolnelektury/static/fonts/cousine/v10/y_AZ5Sz-FwL1lux2xLSTZegdm0LZdjqr5-oayXSOefg.woff2 new file mode 100644 index 000000000..3f07baa4e Binary files /dev/null and b/src/wolnelektury/static/fonts/cousine/v10/y_AZ5Sz-FwL1lux2xLSTZegdm0LZdjqr5-oayXSOefg.woff2 differ diff --git a/src/wolnelektury/static/js/base.js b/src/wolnelektury/static/js/base.js index 16269069a..eee31f914 100644 --- a/src/wolnelektury/static/js/base.js +++ b/src/wolnelektury/static/js/base.js @@ -211,13 +211,13 @@ $('#themes-list-toggle').click(function(event) { case 'block': // n and c return '
  • ' + this.value + '
    • '; case 'next': // > - return '
  • >
    • '; + return '
  • ›
    • '; case 'prev': // < - return '
  • <
    • '; + return '
  • ‹
    • '; case 'first': // [ - return '
  • «
    • '; + return '
  • «
    • '; case 'last': // ] - return '
  • »
    • '; + return '
  • »
    • '; } } }); diff --git a/src/wolnelektury/static/scss/main.scss b/src/wolnelektury/static/scss/main.scss index bab1fb46f..673ff4881 100644 --- a/src/wolnelektury/static/scss/main.scss +++ b/src/wolnelektury/static/scss/main.scss @@ -8,6 +8,7 @@ @import "main/catalogue"; @import "main/cite"; @import "main/dialogs"; +@import "main/fonts"; @import "main/footer"; @import "main/form"; @import "main/fragment"; @@ -17,6 +18,8 @@ @import "main/main_page"; @import "main/menu"; @import "main/picture_box"; +@import "main/picture_slider"; +/*TODO:ogarnac nazwe/lokalizcje scss dla gallery slider*/ @import "main/search"; @import "main/tag"; diff --git a/src/wolnelektury/static/scss/main/fonts.scss b/src/wolnelektury/static/scss/main/fonts.scss new file mode 100644 index 000000000..20abbb66e --- /dev/null +++ b/src/wolnelektury/static/scss/main/fonts.scss @@ -0,0 +1,143 @@ +/* cyrillic-ext */ +@font-face { + font-family: 'Cousine'; + font-style: normal; + font-weight: 400; + src: local('Cousine'), url(/static/fonts/cousine/v10/Bt5Lz7Saa5a5RtsafP9xmfY6323mHUZFJMgTvxaG2iE.woff2) format('woff2'); + unicode-range: U+0460-052F, U+20B4, U+2DE0-2DFF, U+A640-A69F; +} + +/* cyrillic */ +@font-face { + font-family: 'Cousine'; + font-style: normal; + font-weight: 400; + src: local('Cousine'), url(/static/fonts/cousine/v10/IYQIfrNvkAhlEkaWqzgTm_Y6323mHUZFJMgTvxaG2iE.woff2) format('woff2'); + unicode-range: U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116; +} + +/* latin-ext */ +@font-face { + font-family: 'Cousine'; + font-style: normal; + font-weight: 400; + src: local('Cousine'), url(/static/fonts/cousine/v10/qjsoqLzZoDyy_opKVvy-uvY6323mHUZFJMgTvxaG2iE.woff2) format('woff2'); + unicode-range: U+0100-024F, U+1E00-1EFF, U+20A0-20AB, U+20AD-20CF, U+2C60-2C7F, U+A720-A7FF; +} + +/* latin */ +@font-face { + font-family: 'Cousine'; + font-style: normal; + font-weight: 400; + src: local('Cousine'), url(/static/fonts/cousine/v10/0IpceuvDvCegpU9Mz8MQ_g.woff2) format('woff2'); + unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2212, U+2215, U+E0FF, U+EFFD, U+F000; +} + +/* cyrillic-ext */ +@font-face { + font-family: 'Cousine'; + font-style: normal; + font-weight: 700; + src: local('Cousine Bold'), local('Cousine-Bold'), url(/static/fonts/cousine/v10/4OFqQVT4CccEiwAQMKv0eiEAvth_LlrfE80CYdSH47w.woff2) format('woff2'); + unicode-range: U+0460-052F, U+20B4, U+2DE0-2DFF, U+A640-A69F; +} + +/* cyrillic */ +@font-face { + font-family: 'Cousine'; + font-style: normal; + font-weight: 700; + src: local('Cousine Bold'), local('Cousine-Bold'), url(/static/fonts/cousine/v10/auteuWVL5GjOhekECAkC_SEAvth_LlrfE80CYdSH47w.woff2) format('woff2'); + unicode-range: U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116; +} + +/* latin-ext */ +@font-face { + font-family: 'Cousine'; + font-style: normal; + font-weight: 700; + src: local('Cousine Bold'), local('Cousine-Bold'), url(/static/fonts/cousine/v10/JHq2r7PZMuzGPtEvdlprZCEAvth_LlrfE80CYdSH47w.woff2) format('woff2'); + unicode-range: U+0100-024F, U+1E00-1EFF, U+20A0-20AB, U+20AD-20CF, U+2C60-2C7F, U+A720-A7FF; +} + +/* latin */ +@font-face { + font-family: 'Cousine'; + font-style: normal; + font-weight: 700; + src: local('Cousine Bold'), local('Cousine-Bold'), url(/static/fonts/cousine/v10/XkYjaL8YjqL9qW8o0T14ufk_vArhqVIZ0nv9q090hN8.woff2) format('woff2'); + unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2212, U+2215, U+E0FF, U+EFFD, U+F000; +} + +/* cyrillic-ext */ +@font-face { + font-family: 'Cousine'; + font-style: italic; + font-weight: 400; + src: local('Cousine Italic'), local('Cousine-Italic'), url(/static/fonts/cousine/v10/svY-0AsqnhB5pNHScPRpHhJtnKITppOI_IvcXXDNrsc.woff2) format('woff2'); + unicode-range: U+0460-052F, U+20B4, U+2DE0-2DFF, U+A640-A69F; +} + +/* cyrillic */ +@font-face { + font-family: 'Cousine'; + font-style: italic; + font-weight: 400; + src: local('Cousine Italic'), local('Cousine-Italic'), url(/static/fonts/cousine/v10/bS4Fjp2fQa3pRrzTYB6CXhJtnKITppOI_IvcXXDNrsc.woff2) format('woff2'); + unicode-range: U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116; +} + +/* latin-ext */ +@font-face { + font-family: 'Cousine'; + font-style: italic; + font-weight: 400; + src: local('Cousine Italic'), local('Cousine-Italic'), url(/static/fonts/cousine/v10/aWxnkwXsEJCSg-HKkPTCkBJtnKITppOI_IvcXXDNrsc.woff2) format('woff2'); + unicode-range: U+0100-024F, U+1E00-1EFF, U+20A0-20AB, U+20AD-20CF, U+2C60-2C7F, U+A720-A7FF; +} + +/* latin */ +@font-face { + font-family: 'Cousine'; + font-style: italic; + font-weight: 400; + src: local('Cousine Italic'), local('Cousine-Italic'), url(/static/fonts/cousine/v10/0VdvlOBfHobA4eW-NVYk-VtXRa8TVwTICgirnJhmVJw.woff2) format('woff2'); + unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2212, U+2215, U+E0FF, U+EFFD, U+F000; +} + +/* cyrillic-ext */ +@font-face { + font-family: 'Cousine'; + font-style: italic; + font-weight: 700; + src: local('Cousine Bold Italic'), local('Cousine-BoldItalic'), url(/static/fonts/cousine/v10/y_AZ5Sz-FwL1lux2xLSTZa-j2U0lmluP9RWlSytm3ho.woff2) format('woff2'); + unicode-range: U+0460-052F, U+20B4, U+2DE0-2DFF, U+A640-A69F; +} + +/* cyrillic */ +@font-face { + font-family: 'Cousine'; + font-style: italic; + font-weight: 700; + src: local('Cousine Bold Italic'), local('Cousine-BoldItalic'), url(/static/fonts/cousine/v10/y_AZ5Sz-FwL1lux2xLSTZZX5f-9o1vgP2EXwfjgl7AY.woff2) format('woff2'); + unicode-range: U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116; +} + +/* latin-ext */ +@font-face { + font-family: 'Cousine'; + font-style: italic; + font-weight: 700; + src: local('Cousine Bold Italic'), local('Cousine-BoldItalic'), url(/static/fonts/cousine/v10/y_AZ5Sz-FwL1lux2xLSTZT0LW-43aMEzIO6XUTLjad8.woff2) format('woff2'); + unicode-range: U+0100-024F, U+1E00-1EFF, U+20A0-20AB, U+20AD-20CF, U+2C60-2C7F, U+A720-A7FF; +} + +/* latin */ +@font-face { + font-family: 'Cousine'; + font-style: italic; + font-weight: 700; + src: local('Cousine Bold Italic'), local('Cousine-BoldItalic'), url(/static/fonts/cousine/v10/y_AZ5Sz-FwL1lux2xLSTZegdm0LZdjqr5-oayXSOefg.woff2) format('woff2'); + unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2212, U+2215, U+E0FF, U+EFFD, U+F000; +} diff --git a/src/wolnelektury/static/scss/main/header.scss b/src/wolnelektury/static/scss/main/header.scss index 645aa7f52..e720b4d63 100755 --- a/src/wolnelektury/static/scss/main/header.scss +++ b/src/wolnelektury/static/scss/main/header.scss @@ -7,12 +7,11 @@ header#main { color: #bbb; position: relative; - Xtext-align: center; + /*text-align: center;*/ @media screen and (min-width: 1024px) { width: 975px; margin: auto; - } a { @@ -137,7 +136,7 @@ header#main { top: 0; } - X#user-info { + /*#user-info { margin-top: 0; @include size(margin-left, 5px); @include size(margin-right, 5px); @@ -159,7 +158,7 @@ header#main { @include size(margin-right, 0); } - /* We want submenu on far left on small screens. */ + !* We want submenu on far left on small screens. *! .hidden-box-wrapper { position: static; @media screen and (min-width: 24em) { @@ -185,7 +184,7 @@ header#main { color: #0D7E85; } } - } + }*/ form#search-area { position: relative; diff --git a/src/wolnelektury/static/scss/tools.scss b/src/wolnelektury/static/scss/tools.scss index 76869c40d..018a86d9e 100644 --- a/src/wolnelektury/static/scss/tools.scss +++ b/src/wolnelektury/static/scss/tools.scss @@ -53,7 +53,7 @@ $default-em-size: 16px; } @mixin mono { - font-family: "Andale Mono", "Lucida Sans Typewriter", "Courier New"; + font-family: "Cousine"; } @mixin hidden-label {