@@ -, +, @@ --- .../prog/css/fonts/poppins-bold-webfont.woff | Bin 0 -> 23392 bytes .../prog/css/fonts/poppins-bold-webfont.woff2 | Bin 0 -> 17208 bytes .../css/fonts/poppins-bolditalic-webfont.woff | Bin 0 -> 24956 bytes .../fonts/poppins-bolditalic-webfont.woff2 | Bin 0 -> 18484 bytes .../css/fonts/poppins-italic-webfont.woff | Bin 0 -> 25820 bytes .../css/fonts/poppins-italic-webfont.woff2 | Bin 0 -> 19424 bytes .../css/fonts/poppins-regular-webfont.woff | Bin 0 -> 22940 bytes .../css/fonts/poppins-regular-webfont.woff2 | Bin 0 -> 17064 bytes .../intranet-tmpl/prog/css/src/_fonts.scss | 35 ++++++++++++++++++ .../intranet-tmpl/prog/css/src/_mixins.scss | 2 +- .../prog/css/src/staff-global.scss | 5 +-- 11 files changed, 38 insertions(+), 4 deletions(-) create mode 100644 koha-tmpl/intranet-tmpl/prog/css/fonts/poppins-bold-webfont.woff create mode 100644 koha-tmpl/intranet-tmpl/prog/css/fonts/poppins-bold-webfont.woff2 create mode 100644 koha-tmpl/intranet-tmpl/prog/css/fonts/poppins-bolditalic-webfont.woff create mode 100644 koha-tmpl/intranet-tmpl/prog/css/fonts/poppins-bolditalic-webfont.woff2 create mode 100644 koha-tmpl/intranet-tmpl/prog/css/fonts/poppins-italic-webfont.woff create mode 100644 koha-tmpl/intranet-tmpl/prog/css/fonts/poppins-italic-webfont.woff2 create mode 100644 koha-tmpl/intranet-tmpl/prog/css/fonts/poppins-regular-webfont.woff create mode 100644 koha-tmpl/intranet-tmpl/prog/css/fonts/poppins-regular-webfont.woff2 create mode 100644 koha-tmpl/intranet-tmpl/prog/css/src/_fonts.scss --- a/koha-tmpl/intranet-tmpl/prog/css/src/_fonts.scss +++ a/koha-tmpl/intranet-tmpl/prog/css/src/_fonts.scss @@ -0,0 +1,35 @@ +@font-face { + font-family: "poppins"; + font-weight: 400; + font-style: italic; + src: local("Poppins-Italic"), + url("fonts/poppins-italic-webfont.woff2") format("woff2"), + url("fonts/poppins-italic-webfont.woff") format("woff"); +} + +@font-face { + font-family: "poppins"; + font-style: 700; + font-weight: italic; + src: local("Poppins-BoldItalic"), + url("fonts/poppins-bolditalic-webfont.woff2") format("woff2"), + url("fonts/poppins-bolditalic-webfont.woff") format("woff"); +} + +@font-face { + font-family: "poppins"; + font-style: normal; + font-weight: 400; + src: local("Poppins-Regular"), + url("fonts/poppins-regular-webfont.woff2") format("woff2"), + url("fonts/poppins-regular-webfont.woff") format("woff"); +} + +@font-face { + font-family: "poppins"; + font-style: normal; + font-weight: 700; + src: local("Poppins-Bold"), + url("fonts/poppins-bold-webfont.woff2") format("woff2"), + url("fonts/poppins-bold-webfont.woff") format("woff"); +} --- a/koha-tmpl/intranet-tmpl/prog/css/src/_mixins.scss +++ a/koha-tmpl/intranet-tmpl/prog/css/src/_mixins.scss @@ -1,5 +1,5 @@ -$font-main: Arial, Verdana, Helvetica, sans-serif; $font-monospace: "Courier New", Courier, monospace; + $language-footer-min-height: 20px; $table-border-color: #BCBCBC; $table-header-background: #E8E8E8; --- a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss +++ a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss @@ -1,6 +1,7 @@ @import "mixins"; @import "tables"; @import "flatpickr"; +@import "fonts"; ::selection { background: #538200; @@ -274,7 +275,7 @@ main { } body { - font-family: $font-main; + font-family: "poppins", "Arial", "sans-serif"; font-size: 13px; line-height: 1.22; padding: 0 0 4em; @@ -546,7 +547,6 @@ ul { padding-left: 0; button { - font-family: $font-main; padding-bottom: 2px; } @@ -3213,7 +3213,6 @@ nav { button, .btn { border-color: #ADADAD #ADADAD #949494; - font-family: $font-main; &.btn-link { border: 0; --