Andreas/ngx-admin
1
0
Fork 0
mirror of https://github.com/akveo/ngx-admin.git synced 2025-09-22 05:50:48 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

refactor(app): use roboto instead of open-sans

Browse source
This commit is contained in:
tibing 2017-08-31 12:04:09 +03:00
parent 26f788a497
commit d16206f129
5 changed files with 17 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.angular-cli.json
View file

@ -25,7 +25,7 @@
"styles": [ "styles": [
"../node_modules/bootstrap/dist/css/bootstrap.css", "../node_modules/bootstrap/dist/css/bootstrap.css",
"../node_modules/typeface-exo/index.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/ionicons/scss/ionicons.scss",
"../node_modules/font-awesome/scss/font-awesome.scss", "../node_modules/font-awesome/scss/font-awesome.scss",
"../node_modules/nebular-icons/scss/nebular-icons.scss", "../node_modules/nebular-icons/scss/nebular-icons.scss",

10
package-lock.json generated
View file

@ -6152,11 +6152,6 @@
"mimic-fn": "1.1.0" "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": { "opn": {
"version": "5.1.0", "version": "5.1.0",
"resolved": "https://registry.npmjs.org/opn/-/opn-5.1.0.tgz", "resolved": "https://registry.npmjs.org/opn/-/opn-5.1.0.tgz",
@ -7741,6 +7736,11 @@
"inherits": "2.0.3" "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": { "rsvp": {
"version": "3.6.2", "version": "3.6.2",
"resolved": "https://registry.npmjs.org/rsvp/-/rsvp-3.6.2.tgz", "resolved": "https://registry.npmjs.org/rsvp/-/rsvp-3.6.2.tgz",

2
package.json
View file

@ -57,7 +57,7 @@
"ng2-tree": "2.0.0-alpha.5", "ng2-tree": "2.0.0-alpha.5",
"ngx-echarts": "1.2.2", "ngx-echarts": "1.2.2",
"normalize.css": "6.0.0", "normalize.css": "6.0.0",
"open-sans-fontface": "1.4.0", "roboto-fontface": "0.8.0",
"rxjs": "5.4.2", "rxjs": "5.4.2",
"tether": "1.4.0", "tether": "1.4.0",
"tinymce": "4.5.7", "tinymce": "4.5.7",

9
src/app/@theme/styles/themes.scss
View file

@ -13,6 +13,9 @@ $nb-themes: nb-register-theme((
layout-content-width: 1400px, layout-content-width: 1400px,
toggle-layout-color: color-success, toggle-layout-color: color-success,
font-main: Roboto,
font-secondary: Exo,
), default, default); ), default, default);
$nb-themes: nb-register-theme(( $nb-themes: nb-register-theme((
@ -22,6 +25,9 @@ $nb-themes: nb-register-theme((
layout-content-width: 1400px, layout-content-width: 1400px,
toggle-layout-color: link-color-active, toggle-layout-color: link-color-active,
font-main: Roboto,
font-secondary: Exo,
), cosmic, cosmic); ), cosmic, cosmic);
$nb-themes: nb-register-theme(( $nb-themes: nb-register-theme((
@ -29,4 +35,7 @@ $nb-themes: nb-register-theme((
sidebar-header-gap: 2rem, sidebar-header-gap: 2rem,
sidebar-header-height: initial, sidebar-header-height: initial,
layout-content-width: 1400px, layout-content-width: 1400px,
font-main: Roboto,
font-secondary: Exo,
), light, light); ), light, light);

2
src/app/pages/ui-features/typography/typography.component.html
View file

@ -26,7 +26,7 @@
<div class="font-row font-main"> <div class="font-row font-main">
<div class="header"> <div class="header">
<div class="name bold">Open Sans</div> <div class="name bold">Roboto</div>
<div class="variants"> <div class="variants">
<span class="font-w-bold">Bold</span> <span class="font-w-bold">Bold</span>