diff --git a/frontend/src/mock-state.json b/frontend/src/mock-state.json index 48be8b2d..70fa0434 100644 --- a/frontend/src/mock-state.json +++ b/frontend/src/mock-state.json @@ -203,7 +203,7 @@ ], "owner": "b94033c1-3665-4c36-afab-d9c3d0b51c01", "id": "nicola", - "name": "Your Dashboard" + "name": "Your dashboard" }, { "owner": "b94033c1-3665-4c36-afab-d9c3d0b51c01", "uuid": "e12ad7db-91b2-4154-83dd-40dcfc700dcc", diff --git a/ui/src/components/base/global.js b/ui/src/components/base/global.js index 5c6c3443..8c4ae6e1 100644 --- a/ui/src/components/base/global.js +++ b/ui/src/components/base/global.js @@ -9,18 +9,29 @@ const { css } = Styled; -// The name that will be used in the 'font-family' property -const fontFamilies = [ - 'LibreFranklin' -]; - -// The name the font file without the extension -const fontFilenames = [ - 'librefranklin-webfont' +const fonts = [ + { + family: 'LibreFranklin', + filename: 'librefranklin-regular-webfont', + weight: '400', + style: 'normal' + }, + { + family: 'LibreFranklin', + filename: 'librefranklin-semibold-webfont', + weight: '600', + style: 'normal' + }, + { + family: 'LibreFranklin', + filename: 'librefranklin-bold-webfont', + weight: '700', + style: 'normal' + }, ]; module.exports = css` - ${generateFonts(fontFamilies, fontFilenames)} + ${generateFonts(fonts)} html, body { font-size: 16px; diff --git a/ui/src/components/h1/index.js b/ui/src/components/h1/index.js index bd216017..9cd26797 100644 --- a/ui/src/components/h1/index.js +++ b/ui/src/components/h1/index.js @@ -16,4 +16,8 @@ module.exports = styled.h1` font-stretch: normal; color: #364acd; border-bottom: ${remcalc(1)} solid #d8d8d8; + + & a { + text-decoration: none; + } `; diff --git a/ui/src/shared/fonts/LICENSE b/ui/src/shared/fonts/LICENSE new file mode 100644 index 00000000..e9792ccd --- /dev/null +++ b/ui/src/shared/fonts/LICENSE @@ -0,0 +1,43 @@ +Copyright (c) 2015, Impallari Type (www.impallari.com) + +This Font Software is licensed under the SIL Open Font License, Version 1.1. +This license is copied below, and is also available with a FAQ at: http://scripts.sil.org/OFL + +----------------------------------------------------------- +SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 +----------------------------------------------------------- + +PREAMBLE +The goals of the Open Font License (OFL) are to stimulate worldwide development of collaborative font projects, to support the font creation efforts of academic and linguistic communities, and to provide a free and open framework in which fonts may be shared and improved in partnership with others. + +The OFL allows the licensed fonts to be used, studied, modified and redistributed freely as long as they are not sold by themselves. The fonts, including any derivative works, can be bundled, embedded, redistributed and/or sold with any software provided that any reserved names are not used by derivative works. The fonts and derivatives, however, cannot be released under any other type of license. The requirement for fonts to remain under this license does not apply to any document created using the fonts or their derivatives. + +DEFINITIONS +"Font Software" refers to the set of files released by the Copyright Holder(s) under this license and clearly marked as such. This may include source files, build scripts and documentation. + +"Reserved Font Name" refers to any names specified as such after the copyright statement(s). + +"Original Version" refers to the collection of Font Software components as distributed by the Copyright Holder(s). + +"Modified Version" refers to any derivative made by adding to, deleting, or substituting -- in part or in whole -- any of the components of the Original Version, by changing formats or by porting the Font Software to a new environment. + +"Author" refers to any designer, engineer, programmer, technical writer or other person who contributed to the Font Software. + +PERMISSION & CONDITIONS +Permission is hereby granted, free of charge, to any person obtaining a copy of the Font Software, to use, study, copy, merge, embed, modify, redistribute, and sell modified and unmodified copies of the Font Software, subject to the following conditions: + +1) Neither the Font Software nor any of its individual components, in Original or Modified Versions, may be sold by itself. + +2) Original or Modified Versions of the Font Software may be bundled, redistributed and/or sold with any software, provided that each copy contains the above copyright notice and this license. These can be included either as stand-alone text files, human-readable headers or in the appropriate machine-readable metadata fields within text or binary files as long as those fields can be easily viewed by the user. + +3) No Modified Version of the Font Software may use the Reserved Font Name(s) unless explicit written permission is granted by the corresponding Copyright Holder. This restriction only applies to the primary font name as presented to the users. + +4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font Software shall not be used to promote, endorse or advertise any Modified Version, except to acknowledge the contribution(s) of the Copyright Holder(s) and the Author(s) or with their explicit written permission. + +5) The Font Software, modified or unmodified, in part or in whole, must be distributed entirely under this license, and must not be distributed under any other license. The requirement for fonts to remain under this license does not apply to any document created using the Font Software. + +TERMINATION +This license becomes null and void if any of the above conditions are not met. + +DISCLAIMER +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE FONT SOFTWARE. \ No newline at end of file diff --git a/ui/src/shared/fonts/README.md b/ui/src/shared/fonts/README.md new file mode 100644 index 00000000..77cad3ec --- /dev/null +++ b/ui/src/shared/fonts/README.md @@ -0,0 +1 @@ +Source: https://www.fontsquirrel.com/fonts/libre-franklin diff --git a/ui/src/shared/fonts/librefranklin-bold-webfont.eot b/ui/src/shared/fonts/librefranklin-bold-webfont.eot new file mode 100644 index 00000000..73079d8a Binary files /dev/null and b/ui/src/shared/fonts/librefranklin-bold-webfont.eot differ diff --git a/ui/src/shared/fonts/librefranklin-bold-webfont.svg b/ui/src/shared/fonts/librefranklin-bold-webfont.svg new file mode 100644 index 00000000..f60899b7 --- /dev/null +++ b/ui/src/shared/fonts/librefranklin-bold-webfont.svg @@ -0,0 +1,527 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/ui/src/shared/fonts/librefranklin-bold-webfont.ttf b/ui/src/shared/fonts/librefranklin-bold-webfont.ttf new file mode 100644 index 00000000..dc6edc14 Binary files /dev/null and b/ui/src/shared/fonts/librefranklin-bold-webfont.ttf differ diff --git a/ui/src/shared/fonts/librefranklin-bold-webfont.woff b/ui/src/shared/fonts/librefranklin-bold-webfont.woff new file mode 100644 index 00000000..01f6a5ae Binary files /dev/null and b/ui/src/shared/fonts/librefranklin-bold-webfont.woff differ diff --git a/ui/src/shared/fonts/librefranklin-bold-webfont.woff2 b/ui/src/shared/fonts/librefranklin-bold-webfont.woff2 new file mode 100644 index 00000000..8fd4eeec Binary files /dev/null and b/ui/src/shared/fonts/librefranklin-bold-webfont.woff2 differ diff --git a/ui/src/shared/fonts/librefranklin-regular-webfont.eot b/ui/src/shared/fonts/librefranklin-regular-webfont.eot new file mode 100644 index 00000000..7dac5994 Binary files /dev/null and b/ui/src/shared/fonts/librefranklin-regular-webfont.eot differ diff --git a/ui/src/shared/fonts/librefranklin-regular-webfont.svg b/ui/src/shared/fonts/librefranklin-regular-webfont.svg new file mode 100644 index 00000000..dc8e2337 --- /dev/null +++ b/ui/src/shared/fonts/librefranklin-regular-webfont.svg @@ -0,0 +1,527 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/ui/src/shared/fonts/librefranklin-regular-webfont.ttf b/ui/src/shared/fonts/librefranklin-regular-webfont.ttf new file mode 100644 index 00000000..9fcd9432 Binary files /dev/null and b/ui/src/shared/fonts/librefranklin-regular-webfont.ttf differ diff --git a/ui/src/shared/fonts/librefranklin-regular-webfont.woff b/ui/src/shared/fonts/librefranklin-regular-webfont.woff new file mode 100644 index 00000000..104aeccb Binary files /dev/null and b/ui/src/shared/fonts/librefranklin-regular-webfont.woff differ diff --git a/ui/src/shared/fonts/librefranklin-regular-webfont.woff2 b/ui/src/shared/fonts/librefranklin-regular-webfont.woff2 new file mode 100644 index 00000000..05485170 Binary files /dev/null and b/ui/src/shared/fonts/librefranklin-regular-webfont.woff2 differ diff --git a/ui/src/shared/fonts/librefranklin-semibold-webfont.eot b/ui/src/shared/fonts/librefranklin-semibold-webfont.eot new file mode 100644 index 00000000..585e2c6e Binary files /dev/null and b/ui/src/shared/fonts/librefranklin-semibold-webfont.eot differ diff --git a/ui/src/shared/fonts/librefranklin-semibold-webfont.svg b/ui/src/shared/fonts/librefranklin-semibold-webfont.svg new file mode 100644 index 00000000..f2c2e078 --- /dev/null +++ b/ui/src/shared/fonts/librefranklin-semibold-webfont.svg @@ -0,0 +1,527 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/ui/src/shared/fonts/librefranklin-semibold-webfont.ttf b/ui/src/shared/fonts/librefranklin-semibold-webfont.ttf new file mode 100644 index 00000000..448ad8d3 Binary files /dev/null and b/ui/src/shared/fonts/librefranklin-semibold-webfont.ttf differ diff --git a/ui/src/shared/fonts/librefranklin-semibold-webfont.woff b/ui/src/shared/fonts/librefranklin-semibold-webfont.woff new file mode 100644 index 00000000..6d48ef47 Binary files /dev/null and b/ui/src/shared/fonts/librefranklin-semibold-webfont.woff differ diff --git a/ui/src/shared/fonts/librefranklin-semibold-webfont.woff2 b/ui/src/shared/fonts/librefranklin-semibold-webfont.woff2 new file mode 100644 index 00000000..1f73b4b1 Binary files /dev/null and b/ui/src/shared/fonts/librefranklin-semibold-webfont.woff2 differ diff --git a/ui/src/shared/fonts/librefranklin-webfont.eot b/ui/src/shared/fonts/librefranklin-webfont.eot deleted file mode 100755 index 88e60e15..00000000 Binary files a/ui/src/shared/fonts/librefranklin-webfont.eot and /dev/null differ diff --git a/ui/src/shared/fonts/librefranklin-webfont.svg b/ui/src/shared/fonts/librefranklin-webfont.svg deleted file mode 100755 index db7bc77a..00000000 --- a/ui/src/shared/fonts/librefranklin-webfont.svg +++ /dev/null @@ -1,475 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/ui/src/shared/fonts/librefranklin-webfont.ttf b/ui/src/shared/fonts/librefranklin-webfont.ttf deleted file mode 100755 index bd5319cc..00000000 Binary files a/ui/src/shared/fonts/librefranklin-webfont.ttf and /dev/null differ diff --git a/ui/src/shared/fonts/librefranklin-webfont.woff b/ui/src/shared/fonts/librefranklin-webfont.woff deleted file mode 100755 index 1826ba48..00000000 Binary files a/ui/src/shared/fonts/librefranklin-webfont.woff and /dev/null differ diff --git a/ui/src/shared/fonts/librefranklin-webfont.woff2 b/ui/src/shared/fonts/librefranklin-webfont.woff2 deleted file mode 100755 index 38b8e4df..00000000 Binary files a/ui/src/shared/fonts/librefranklin-webfont.woff2 and /dev/null differ diff --git a/ui/src/shared/functions.js b/ui/src/shared/functions.js index b33f48ed..45a2227e 100644 --- a/ui/src/shared/functions.js +++ b/ui/src/shared/functions.js @@ -14,19 +14,19 @@ const rndId = (_code) => { : lastDigit; }; -const generateFonts = (fontFamilies, fontFilenames) => { +const generateFonts = (fonts) => { const pathToFont = './fonts/'; let fontCSS = ''; - fontFamilies.forEach( (fontFamily, i) => { - const eot = require(`${pathToFont + fontFilenames[i]}.eot`); - const woff = require(`${pathToFont + fontFilenames[i]}.woff`); - const woff2 = require(`${pathToFont + fontFilenames[i]}.woff2`); - const ttf = require(`${pathToFont + fontFilenames[i]}.ttf`); - const svg = require(`${pathToFont + fontFilenames[i]}.svg`); + fonts.forEach((obj) => { + const eot = require(`${pathToFont + obj.filename}.eot`); + const woff = require(`${pathToFont + obj.filename}.woff`); + const woff2 = require(`${pathToFont + obj.filename}.woff2`); + const ttf = require(`${pathToFont + obj.filename}.ttf`); + const svg = require(`${pathToFont + obj.filename}.svg`); fontCSS += ` @font-face { - font-family: '${fontFamily}'; + font-family: '${obj.family}'; src: url('${eot}'), url('${eot}?#iefix') format('embedded-opentype'), @@ -36,10 +36,10 @@ const generateFonts = (fontFamilies, fontFilenames) => { format('woff2'), url('${ttf}') format('truetype'), - url('${svg}#${fontFamily}') - format('svg') - font-weight: normal; - font-style: normal; + url('${svg}#${obj.family}') + format('svg'); + font-weight: ${obj.weight}; + font-style: ${obj.style}; } `; });