diff --git a/lib/gui/app/scss/main.scss b/lib/gui/app/scss/main.scss index 26ce6cc6..dd573f52 100644 --- a/lib/gui/app/scss/main.scss +++ b/lib/gui/app/scss/main.scss @@ -41,10 +41,44 @@ $disabled-opacity: 0.2; @import "../pages/settings/styles/settings"; @import "../pages/finish/styles/finish"; +@font-face { + font-family: Roboto; + src: url('../../../node_modules/roboto-fontface/fonts/roboto/Roboto-Thin.woff'); + font-weight: 100; + font-style: normal; +} + +@font-face { + font-family: Roboto; + src: url('../../../node_modules/roboto-fontface/fonts/roboto/Roboto-Light.woff'); + font-weight: 300; + font-style: normal; +} + +@font-face { + font-family: Roboto; + src: url('../../../node_modules/roboto-fontface/fonts/roboto/Roboto-Regular.woff'); + font-weight: 400; + font-style: normal; +} + +@font-face { + font-family: Roboto; + src: url('../../../node_modules/roboto-fontface/fonts/roboto/Roboto-Bold.woff'); + font-weight: 700; + font-style: normal; +} + body { letter-spacing: 1px; } +body, +.tooltip, +.popover { + font-family: Roboto; +} + .section-footer { display: flex; align-items: center; diff --git a/lib/gui/css/main.css b/lib/gui/css/main.css index 57138136..b5c0a66d 100644 --- a/lib/gui/css/main.css +++ b/lib/gui/css/main.css @@ -6690,9 +6690,38 @@ svg-icon > img[disabled] { border-top: none; height: 39px; } +@font-face { + font-family: Roboto; + src: url("../../../node_modules/roboto-fontface/fonts/roboto/Roboto-Thin.woff"); + font-weight: 100; + font-style: normal; } + +@font-face { + font-family: Roboto; + src: url("../../../node_modules/roboto-fontface/fonts/roboto/Roboto-Light.woff"); + font-weight: 300; + font-style: normal; } + +@font-face { + font-family: Roboto; + src: url("../../../node_modules/roboto-fontface/fonts/roboto/Roboto-Regular.woff"); + font-weight: 400; + font-style: normal; } + +@font-face { + font-family: Roboto; + src: url("../../../node_modules/roboto-fontface/fonts/roboto/Roboto-Bold.woff"); + font-weight: 700; + font-style: normal; } + body { letter-spacing: 1px; } +body, +.tooltip, +.popover { + font-family: Roboto; } + .section-footer { display: flex; align-items: center; diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index 21127cc1..f597e5e0 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -6627,6 +6627,10 @@ "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.1.tgz", "dev": true }, + "roboto-fontface": { + "version": "0.9.0", + "resolved": "https://registry.npmjs.org/roboto-fontface/-/roboto-fontface-0.9.0.tgz" + }, "run-async": { "version": "0.1.0", "resolved": "https://registry.npmjs.org/run-async/-/run-async-0.1.0.tgz" diff --git a/package.json b/package.json index 79d87e0b..f5b84b37 100644 --- a/package.json +++ b/package.json @@ -80,6 +80,7 @@ "resin-cli-form": "1.4.1", "resin-cli-visuals": "1.4.1", "resin-corvus": "1.0.0-beta.31", + "roboto-fontface": "0.9.0", "semver": "5.1.1", "speedometer": "1.0.0", "sudo-prompt": "8.0.0",