@@ -, +, @@
for loading them
---
koha-tmpl/intranet-tmpl/prog/en/modules/about.tt | 6 +++
.../bootstrap/css/fonts/NotoSans-Bold-webfont.woff | Bin 0 -> 22052 bytes
.../css/fonts/NotoSans-Bold-webfont.woff2 | Bin 0 -> 17528 bytes
.../css/fonts/NotoSans-BoldItalic-webfont.woff | Bin 0 -> 23244 bytes
.../css/fonts/NotoSans-BoldItalic-webfont.woff2 | Bin 0 -> 18424 bytes
.../css/fonts/NotoSans-Italic-webfont.woff | Bin 0 -> 23692 bytes
.../css/fonts/NotoSans-Italic-webfont.woff2 | Bin 0 -> 18908 bytes
.../css/fonts/NotoSans-Regular-webfont.woff | Bin 0 -> 22288 bytes
.../css/fonts/NotoSans-Regular-webfont.woff2 | Bin 0 -> 17696 bytes
koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss | 50 +++++++++++++++++++--
.../bootstrap/en/includes/doc-head-close.inc | 4 --
.../bootstrap/en/includes/opac-bottom.inc | 1 +
koha-tmpl/opac-tmpl/bootstrap/js/global.js | 16 +++++++
.../bootstrap/lib/fontfaceobserver.min.js | 12 +++++
14 files changed, 81 insertions(+), 8 deletions(-)
create mode 100644 koha-tmpl/opac-tmpl/bootstrap/css/fonts/NotoSans-Bold-webfont.woff
create mode 100644 koha-tmpl/opac-tmpl/bootstrap/css/fonts/NotoSans-Bold-webfont.woff2
create mode 100644 koha-tmpl/opac-tmpl/bootstrap/css/fonts/NotoSans-BoldItalic-webfont.woff
create mode 100644 koha-tmpl/opac-tmpl/bootstrap/css/fonts/NotoSans-BoldItalic-webfont.woff2
create mode 100644 koha-tmpl/opac-tmpl/bootstrap/css/fonts/NotoSans-Italic-webfont.woff
create mode 100644 koha-tmpl/opac-tmpl/bootstrap/css/fonts/NotoSans-Italic-webfont.woff2
create mode 100644 koha-tmpl/opac-tmpl/bootstrap/css/fonts/NotoSans-Regular-webfont.woff
create mode 100644 koha-tmpl/opac-tmpl/bootstrap/css/fonts/NotoSans-Regular-webfont.woff2
create mode 100644 koha-tmpl/opac-tmpl/bootstrap/lib/fontfaceobserver.min.js
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt
@@ -960,6 +960,12 @@
JSZip
The JSZip JavaScript library is licensed under both the MIT and GPLv3 Licenses.
+
+ Font Face Observer
+ Font Face Observer is a JavaScript library by Bram Stein licensed under the BSD License.
+
+ Noto fonts
+ Noto by Google is a family of fonts licensed under the SIL Open Font License (OFL) v1.1.
--- a/koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss
+++ a/koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss
@@ -1,11 +1,52 @@
@import "mixins";
+@font-face {
+ font-family: 'NotoSans';
+ font-style: normal;
+ font-weight: 400;
+ src: local('Noto Sans Regular'),
+ url('fonts/NotoSans-Regular-webfont.woff2') format('woff2'),
+ url('fonts/NotoSans-Regular-webfont.woff') format('woff');
+}
+
+@font-face {
+ font-family: 'NotoSans';
+ font-style: bold;
+ font-weight: 700;
+ src: local('Noto Sans Bold'),
+ url('fonts/NotoSans-Bold-webfont.woff2') format('woff2'),
+ url('fonts/NotoSans-Bold-webfont.woff') format('woff');
+}
+
+@font-face {
+ font-family: 'NotoSans';
+ font-style: italic;
+ font-weight: 400;
+ src: local('Noto Sans Italic'),
+ url('fonts/NotoSans-Italic-webfont.woff2') format('woff2'),
+ url('fonts/NotoSans-Italic-webfont.woff') format('woff');
+}
+
+@font-face {
+ font-family: 'NotoSans';
+ font-style: italic;
+ font-weight: 700;
+ src: local('Noto Sans Bold Italic'),
+ url('fonts/NotoSans-BoldItalic-webfont.woff2') format('woff2'),
+ url('fonts/NotoSans-BoldItalic-webfont.woff') format('woff');
+}
+
+
body {
background: #FCF9FC none;
- font-family: 'NotoSansRegular';
+ font-family: sans-serif;
font-size: 16px;
}
+.fonts-loaded body {
+ font-family: 'NotoSans';
+}
+
/* Sticky footer styles */
html,
body {
@@ -410,7 +451,7 @@ th {
background-color: #85ca11;
color: #FFF;
display: inline;
- font-family: 'NotoSansRegular';
+ font-family: 'NotoSans';
font-size: 80%;
font-weight: normal;
margin: 0 0 0 .9em;
@@ -655,7 +696,7 @@ th {
background-color: #85ca11;
background-image: linear-gradient(to bottom, #85ca11, #77b50f);
background-position: 0;
- font-family: 'NotoSansRegular';
+ font-family: 'NotoSans';
&:hover {
background-color: #85ca11;
background-image: linear-gradient(to bottom, #85ca11, #77b50f);
@@ -722,6 +763,7 @@ input[type="text"]:focus {
> a {
color: #727272;
font-weight: bold;
+ text-shadow: none;
&:hover {
color: #85ca11;
}
@@ -815,7 +857,7 @@ input[type="text"]:focus {
.ui-widget select,
.ui-widget textarea,
.ui-widget button {
- font-family: 'NotoSansRegular';
+ font-family: 'NotoSans';
font-size: inherit;
}
--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/doc-head-close.inc
+++ a/koha-tmpl/opac-tmpl/bootstrap/en/includes/doc-head-close.inc
@@ -17,10 +17,6 @@
[% Asset.css("lib/jquery/jquery-ui.css") | $raw %]
[% END %]
-
-
-
-
[% SET opaclayoutstylesheet='opac_' _ KOHA_VERSION _ '.css' UNLESS opaclayoutstylesheet %]
[% IF (opaclayoutstylesheet.match('^https?:|^\/')) %]
--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc
+++ a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc
@@ -87,6 +87,7 @@
$.widget.bridge('uitooltip', $.ui.tooltip);
[% Asset.js("lib/bootstrap/js/bootstrap.min.js") | $raw %]
+[% Asset.js("lib/fontfaceobserver.min.js") | $raw %]
[% Asset.js("js/global.js") | $raw %]