diff --git a/app/fonts/fontello/LICENSE.txt b/app/fonts/fontello/LICENSE.txt new file mode 100644 index 0000000..17dc23b --- /dev/null +++ b/app/fonts/fontello/LICENSE.txt @@ -0,0 +1,30 @@ +Font license info + + +## Typicons + + (c) Stephen Hutchings 2012 + + Author: Stephen Hutchings + License: SIL (http://scripts.sil.org/OFL) + Homepage: http://typicons.com/ + + +## Fontelico + + Copyright (C) 2012 by Fontello project + + Author: Crowdsourced, for Fontello project + License: SIL (http://scripts.sil.org/OFL) + Homepage: http://fontello.com + + +## Font Awesome + + Copyright (C) 2016 by Dave Gandy + + Author: Dave Gandy + License: SIL () + Homepage: http://fortawesome.github.com/Font-Awesome/ + + diff --git a/app/fonts/fontello/README.txt b/app/fonts/fontello/README.txt new file mode 100644 index 0000000..beaab33 --- /dev/null +++ b/app/fonts/fontello/README.txt @@ -0,0 +1,75 @@ +This webfont is generated by http://fontello.com open source project. + + +================================================================================ +Please, note, that you should obey original font licenses, used to make this +webfont pack. Details available in LICENSE.txt file. + +- Usually, it's enough to publish content of LICENSE.txt file somewhere on your + site in "About" section. + +- If your project is open-source, usually, it will be ok to make LICENSE.txt + file publicly available in your repository. + +- Fonts, used in Fontello, don't require a clickable link on your site. + But any kind of additional authors crediting is welcome. +================================================================================ + + +Comments on archive content +--------------------------- + +- /font/* - fonts in different formats + +- /css/* - different kinds of css, for all situations. Should be ok with + twitter bootstrap. Also, you can skip style and assign icon classes + directly to text elements, if you don't mind about IE7. + +- demo.html - demo file, to show your webfont content + +- LICENSE.txt - license info about source fonts, used to build your one. + +- config.json - keeps your settings. You can import it back into fontello + anytime, to continue your work + + +Why so many CSS files ? +----------------------- + +Because we like to fit all your needs :) + +- basic file, .css - is usually enough, it contains @font-face + and character code definitions + +- *-ie7.css - if you need IE7 support, but still don't wish to put char codes + directly into html + +- *-codes.css and *-ie7-codes.css - if you like to use your own @font-face + rules, but still wish to benefit from css generation. That can be very + convenient for automated asset build systems. When you need to update font - + no need to manually edit files, just override old version with archive + content. See fontello source code for examples. + +- *-embedded.css - basic css file, but with embedded WOFF font, to avoid + CORS issues in Firefox and IE9+, when fonts are hosted on the separate domain. + We strongly recommend to resolve this issue by `Access-Control-Allow-Origin` + server headers. But if you ok with dirty hack - this file is for you. Note, + that data url moved to separate @font-face to avoid problems with + + + + + + + +
+

icons font demo

+ +
+
+
+
icon-heart-outline0xe803
+
icon-heart-filled0xe804
+
icon-check0xe807
+
icon-plus0xe808
+
+
+
icon-loading0xe839
+
icon-external0xf08e
+
+
+
Generated by fontello.com
+ + \ No newline at end of file diff --git a/app/fonts/fontello/font/icons.eot b/app/fonts/fontello/font/icons.eot new file mode 100644 index 0000000..7984ba9 Binary files /dev/null and b/app/fonts/fontello/font/icons.eot differ diff --git a/app/fonts/fontello/font/icons.svg b/app/fonts/fontello/font/icons.svg new file mode 100644 index 0000000..8f26a97 --- /dev/null +++ b/app/fonts/fontello/font/icons.svg @@ -0,0 +1,22 @@ + + + +Copyright (C) 2019 by original authors @ fontello.com + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/fonts/fontello/font/icons.ttf b/app/fonts/fontello/font/icons.ttf new file mode 100644 index 0000000..2c614cf Binary files /dev/null and b/app/fonts/fontello/font/icons.ttf differ diff --git a/app/fonts/fontello/font/icons.woff b/app/fonts/fontello/font/icons.woff new file mode 100644 index 0000000..ecc3bf5 Binary files /dev/null and b/app/fonts/fontello/font/icons.woff differ diff --git a/app/fonts/fontello/font/icons.woff2 b/app/fonts/fontello/font/icons.woff2 new file mode 100644 index 0000000..4066583 Binary files /dev/null and b/app/fonts/fontello/font/icons.woff2 differ diff --git a/app/fonts/fontello/fontello-config.json b/app/fonts/fontello/fontello-config.json new file mode 100644 index 0000000..d4b52cc --- /dev/null +++ b/app/fonts/fontello/fontello-config.json @@ -0,0 +1,46 @@ +{ + "name": "icons", + "css_prefix_text": "icon-", + "css_use_suffix": false, + "hinting": true, + "units_per_em": 1000, + "ascent": 850, + "glyphs": [ + { + "uid": "e15f0d620a7897e2035c18c80142f6d9", + "css": "external", + "code": 61582, + "src": "fontawesome" + }, + { + "uid": "9bc2902722abb366a213a052ade360bc", + "css": "loading", + "code": 59449, + "src": "fontelico" + }, + { + "uid": "3b00728aa97ad1a2581d414bd9d650bc", + "css": "heart-outline", + "code": 59395, + "src": "typicons" + }, + { + "uid": "hi76m8qggwn5lbl286oeqp64q0n8kusy", + "css": "heart-filled", + "code": 59396, + "src": "typicons" + }, + { + "uid": "43fl9m553j1z5937vfjz0lgolrlspxwl", + "css": "check", + "code": 59399, + "src": "typicons" + }, + { + "uid": "1gf923f9wvaezxmfon515dglxa3drf0e", + "css": "plus", + "code": 59400, + "src": "typicons" + } + ] +} \ No newline at end of file diff --git a/app/i18n/index.js b/app/i18n/index.js index 573f31b..dd5ed5e 100644 --- a/app/i18n/index.js +++ b/app/i18n/index.js @@ -26,6 +26,7 @@ export class I18n { result = language[section][phrase]; } else { console.error(`The translation for "${section}.${phrase}" is set up in neither the target nor default locale.`); + result = `${section}.${phrase}`; } return result; diff --git a/app/i18n/locales/en.json b/app/i18n/locales/en.json index 6f64729..de6816e 100644 --- a/app/i18n/locales/en.json +++ b/app/i18n/locales/en.json @@ -16,5 +16,9 @@ "people_header": "People", "series_header": "Series", "books_header": "Books" + }, + "interaction": { + "heart": "Like", + "add": "Add to Shelf" } } \ No newline at end of file diff --git a/app/styles/index.scss b/app/styles/index.scss index d90d82f..88e5a36 100644 --- a/app/styles/index.scss +++ b/app/styles/index.scss @@ -36,10 +36,14 @@ // @import '../../node_modules/picnic/src/plugins/dropimage/plugin'; // @import '../../node_modules/picnic/src/plugins/tabs/plugin'; -// @import '../../node_modules/picnic/src/plugins/tooltip/plugin'; +@import '../../node_modules/picnic/src/plugins/tooltip/plugin'; // Custom global styling @import './picnic-customizations/custom'; // View styling @import './search'; + +// Icons +@import '../fonts/fontello/css/animation.css'; +@import '../fonts/fontello/css/icons.css'; diff --git a/app/styles/picnic-customizations/_custom.scss b/app/styles/picnic-customizations/_custom.scss index df19bba..ca5d1ed 100644 --- a/app/styles/picnic-customizations/_custom.scss +++ b/app/styles/picnic-customizations/_custom.scss @@ -26,14 +26,14 @@ footer nav { } // External links -// a[href^="http://"]:not([href*="localhost"]):not([href*="guts.plus"]):after, -// a[href^="https://"]:not([href*="localhost"]):not([href*="guts.plus"]):after{ -// font-family: "icons"; -// font-size: 70%; -// vertical-align: top; -// margin-left: 3px; -// content: "\f08e"; -// } +a[href^="http://"]:after, +a[href^="https://"]:after{ + font-family: "icons"; + font-size: 70%; + vertical-align: top; + margin-left: 3px; + content: "\f08e"; +} .menu ul li { display: inline-block; diff --git a/app/views/search/index.js b/app/views/search/index.js index c09bef2..5946227 100644 --- a/app/views/search/index.js +++ b/app/views/search/index.js @@ -22,7 +22,7 @@ export const searchView = (state, emit) => {

${i18n.__('search.header')}

- ${controller.doneSearching ? 'Done searching' : 'Loading...'} + ${controller.doneSearching ? null : html`

`} ${controller.results.works < 1 ? null @@ -36,9 +36,19 @@ export const searchView = (state, emit) => {

${result.name}

${result.description ? html`

${result.description}

` : null} + + + + + +
- See details on Inventaire + See details on Inventaire
`; }),