Bundle Roboto font.

This commit is contained in:
Oliver Hamlet
2014-12-27 14:11:58 +00:00
parent 9c037e1bab
commit 35b885b0d8
13 changed files with 57 additions and 9 deletions
+1 -1
View File
@@ -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);
}
+52 -1
View File
@@ -21,8 +21,59 @@
along with LOOT. If not, see
<http://www.gnu.org/licenses/>.
*/
/* 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;
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
-7
View File
@@ -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&amp;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;
+1
View File
@@ -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') )
+3
View File
@@ -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"