diff --git a/resources/report/css/material.css b/resources/report/css/material.css index 4a69c94d..f3cf3400 100644 --- a/resources/report/css/material.css +++ b/resources/report/css/material.css @@ -4,7 +4,7 @@ /* core-tooltip */ html /deep/ core-tooltip::shadow .core-tooltip { font-size: 0.714rem; - font-family: RobotoDraft, sans-serif; + font-family: Roboto, sans-serif; font-weight: 500; background-color: rgba(0, 0, 0, 0.9); } diff --git a/resources/report/css/style.css b/resources/report/css/style.css index fbd9aad2..fa89b022 100644 --- a/resources/report/css/style.css +++ b/resources/report/css/style.css @@ -21,8 +21,59 @@ along with LOOT. If not, see . */ +/* Font definitions */ +@font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 300; + src: url('../fonts/Roboto-Light.ttf'); +} +@font-face { + font-family: 'Roboto'; + font-style: italic; + font-weight: 300; + src: url('../fonts/Roboto-LightItalic.ttf'); +} +@font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 400; + src: url('../fonts/Roboto-Regular.ttf'); +} +@font-face { + font-family: 'Roboto'; + font-style: italic; + font-weight: 400; + src: url('../fonts/Roboto-Italic.ttf'); +} +@font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 500; + src: url('../fonts/Roboto-Medium.ttf'); +} +@font-face { + font-family: 'Roboto'; + font-style: italic; + font-weight: 500; + src: url('../fonts/Roboto-MediumItalic.ttf'); +} +@font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 700; + src: url('../fonts/Roboto-Bold.ttf'); +} +@font-face { + font-family: 'Roboto'; + font-style: italic; + font-weight: 700; + src: url('../fonts/Roboto-BoldItalic.ttf'); +} + +/* Typography */ html { - font:11pt/1.429 RobotoDraft, sans-serif; + font:11pt/1.429 Roboto, sans-serif; color: rgba(0, 0, 0, 0.87); font-weight: 400; text-rendering: optimizeLegibility; diff --git a/resources/report/fonts/Roboto-Bold.ttf b/resources/report/fonts/Roboto-Bold.ttf new file mode 100644 index 00000000..68822caf Binary files /dev/null and b/resources/report/fonts/Roboto-Bold.ttf differ diff --git a/resources/report/fonts/Roboto-BoldItalic.ttf b/resources/report/fonts/Roboto-BoldItalic.ttf new file mode 100644 index 00000000..aebf8eb0 Binary files /dev/null and b/resources/report/fonts/Roboto-BoldItalic.ttf differ diff --git a/resources/report/fonts/Roboto-Italic.ttf b/resources/report/fonts/Roboto-Italic.ttf new file mode 100644 index 00000000..2041cbc0 Binary files /dev/null and b/resources/report/fonts/Roboto-Italic.ttf differ diff --git a/resources/report/fonts/Roboto-Light.ttf b/resources/report/fonts/Roboto-Light.ttf new file mode 100644 index 00000000..aa453407 Binary files /dev/null and b/resources/report/fonts/Roboto-Light.ttf differ diff --git a/resources/report/fonts/Roboto-LightItalic.ttf b/resources/report/fonts/Roboto-LightItalic.ttf new file mode 100644 index 00000000..a85444f2 Binary files /dev/null and b/resources/report/fonts/Roboto-LightItalic.ttf differ diff --git a/resources/report/fonts/Roboto-Medium.ttf b/resources/report/fonts/Roboto-Medium.ttf new file mode 100644 index 00000000..a3c1a1f1 Binary files /dev/null and b/resources/report/fonts/Roboto-Medium.ttf differ diff --git a/resources/report/fonts/Roboto-MediumItalic.ttf b/resources/report/fonts/Roboto-MediumItalic.ttf new file mode 100644 index 00000000..b8282055 Binary files /dev/null and b/resources/report/fonts/Roboto-MediumItalic.ttf differ diff --git a/resources/report/fonts/Roboto-Regular.ttf b/resources/report/fonts/Roboto-Regular.ttf new file mode 100644 index 00000000..0e58508a Binary files /dev/null and b/resources/report/fonts/Roboto-Regular.ttf differ diff --git a/resources/report/js/script.js b/resources/report/js/script.js index 65003f89..6fb6af6b 100644 --- a/resources/report/js/script.js +++ b/resources/report/js/script.js @@ -1269,13 +1269,6 @@ window.addEventListener('polymer-ready', function(e) { /* Set the plugin list's scroll target to its parent. */ document.getElementById('main').lastElementChild.scrollTarget = document.getElementById('main'); - /* Add Roboto font loader. */ - var link = document.createElement('link'); - link.href = 'http://fonts.googleapis.com/css?family=RobotoDraft:regular,bold,italic,thin,light,bolditalic,black,medium&lang=en'; - link.rel = 'stylesheet'; - link.type = 'text/css'; - document.head.appendChild(link); - require(['bower_components/marked/lib/marked', 'js/l10n', 'js/plugin', 'js/filters'], function(markedResponse, l10nResponse) { marked = markedResponse; l10n = l10nResponse; diff --git a/src/archive.py b/src/archive.py index 2bcb6836..33d16d9b 100644 --- a/src/archive.py +++ b/src/archive.py @@ -138,6 +138,7 @@ def createAppArchive(archive_path): shutil.copy( os.path.join('..', 'resources', 'report', 'index.html'), os.path.join(temp_path, 'resources', 'report') ) shutil.copy( os.path.join('..', 'resources', 'report', 'bower_components', 'marked', 'lib', 'marked.js'), os.path.join(temp_path, 'resources', 'report', 'bower_components', 'marked', 'lib') ) shutil.copy( os.path.join('..', 'resources', 'report', 'bower_components', 'Jed', 'jed.js'), os.path.join(temp_path, 'resources', 'report', 'bower_components', 'Jed') ) + shutil.copytree( os.path.join('..', 'resources', 'report', 'fonts'), os.path.join(temp_path, 'resources', 'report', 'fonts') ) shutil.copy( os.path.join('..', 'resources', 'report', 'js', 'jedGettextParser.js'), os.path.join(temp_path, 'resources', 'report', 'js') ) shutil.copy( os.path.join('..', 'resources', 'report', 'js', 'l10n.js'), os.path.join(temp_path, 'resources', 'report', 'js') ) shutil.copy( os.path.join('..', 'resources', 'report', 'js', 'plugin.js'), os.path.join(temp_path, 'resources', 'report', 'js') ) diff --git a/src/installer.nsi b/src/installer.nsi index cc818dc8..0dbf03b6 100644 --- a/src/installer.nsi +++ b/src/installer.nsi @@ -327,6 +327,8 @@ FunctionEnd File "..\resources\report\bower_components\marked\lib\marked.js" SetOutPath "$INSTDIR\resources\report\bower_components\Jed" File "..\resources\report\bower_components\Jed\jed.js" + SetOutPath "$INSTDIR\resources\report\fonts" + File "..\resources\report\fonts\*" SetOutPath "$INSTDIR\resources\report\js" File "..\resources\report\js\jedGettextParser.js" File "..\resources\report\js\l10n.js" @@ -480,6 +482,7 @@ FunctionEnd Delete "$INSTDIR\resources\report\index.html" Delete "$INSTDIR\resources\report\bower_components\marked\lib\marked.js" Delete "$INSTDIR\resources\report\bower_components\Jed\jed.js" + RMDir /r "$INSTDIR\resources\report\fonts" Delete "$INSTDIR\resources\report\js\jedGettextParser.js" Delete "$INSTDIR\resources\report\js\l10n.js" Delete "$INSTDIR\resources\report\js\plugin.js"