diff --git a/.angular-cli.json b/.angular-cli.json index cef66bc1..007272a0 100644 --- a/.angular-cli.json +++ b/.angular-cli.json @@ -25,7 +25,7 @@ "styles": [ "../node_modules/bootstrap/dist/css/bootstrap.css", "../node_modules/typeface-exo/index.css", - "../node_modules/open-sans-fontface/open-sans.css", + "../node_modules/roboto-fontface/css/roboto/roboto-fontface.css", "../node_modules/ionicons/scss/ionicons.scss", "../node_modules/font-awesome/scss/font-awesome.scss", "../node_modules/nebular-icons/scss/nebular-icons.scss", diff --git a/package-lock.json b/package-lock.json index a4ecc792..473bdd84 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6152,11 +6152,6 @@ "mimic-fn": "1.1.0" } }, - "open-sans-fontface": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/open-sans-fontface/-/open-sans-fontface-1.4.0.tgz", - "integrity": "sha1-A8xtG/XmqLW0eRCIhWL3IsXdNCg=" - }, "opn": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/opn/-/opn-5.1.0.tgz", @@ -7741,6 +7736,11 @@ "inherits": "2.0.3" } }, + "roboto-fontface": { + "version": "0.8.0", + "resolved": "https://registry.npmjs.org/roboto-fontface/-/roboto-fontface-0.8.0.tgz", + "integrity": "sha512-ZYzRkETgBrdEGzL5JSKimvjI2CX7ioyZCkX2BpcfyjqI+079W0wHAyj5W4rIZMcDSOHgLZtgz1IdDi/vU77KEQ==" + }, "rsvp": { "version": "3.6.2", "resolved": "https://registry.npmjs.org/rsvp/-/rsvp-3.6.2.tgz", diff --git a/package.json b/package.json index f6f234b7..8811c955 100644 --- a/package.json +++ b/package.json @@ -57,7 +57,7 @@ "ng2-tree": "2.0.0-alpha.5", "ngx-echarts": "1.2.2", "normalize.css": "6.0.0", - "open-sans-fontface": "1.4.0", + "roboto-fontface": "0.8.0", "rxjs": "5.4.2", "tether": "1.4.0", "tinymce": "4.5.7", diff --git a/src/app/@theme/styles/themes.scss b/src/app/@theme/styles/themes.scss index 14f18d12..7365d0f4 100644 --- a/src/app/@theme/styles/themes.scss +++ b/src/app/@theme/styles/themes.scss @@ -13,6 +13,9 @@ $nb-themes: nb-register-theme(( layout-content-width: 1400px, toggle-layout-color: color-success, + + font-main: Roboto, + font-secondary: Exo, ), default, default); $nb-themes: nb-register-theme(( @@ -22,6 +25,9 @@ $nb-themes: nb-register-theme(( layout-content-width: 1400px, toggle-layout-color: link-color-active, + + font-main: Roboto, + font-secondary: Exo, ), cosmic, cosmic); $nb-themes: nb-register-theme(( @@ -29,4 +35,7 @@ $nb-themes: nb-register-theme(( sidebar-header-gap: 2rem, sidebar-header-height: initial, layout-content-width: 1400px, + + font-main: Roboto, + font-secondary: Exo, ), light, light); diff --git a/src/app/pages/ui-features/typography/typography.component.html b/src/app/pages/ui-features/typography/typography.component.html index f08f75ee..ee4177f0 100644 --- a/src/app/pages/ui-features/typography/typography.component.html +++ b/src/app/pages/ui-features/typography/typography.component.html @@ -26,7 +26,7 @@
-
Open Sans
+
Roboto
Bold