zhongjin
/
cartodb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed Lato font + lato loader

Browse Source
pull/10761/head
xavijam 8 years ago
parent 49274f6e2b
commit 47c7198042
3 changed files with 0 additions and 40 deletions
Show Stats Download Patch File Download Diff File

1
.eslintignore
Unescape View File

@ -310,7 +310,6 @@
**/lib/assets/javascripts/cartodb/explore/feed_collection.js
**/lib/assets/javascripts/cartodb/explore/model.js
**/lib/assets/javascripts/cartodb/explore/view.js
**/lib/assets/javascripts/cartodb/fonts/lato_loader.js
**/lib/assets/javascripts/cartodb/keys/entry.js
**/lib/assets/javascripts/cartodb/keys/header_view_model.js
**/lib/assets/javascripts/cartodb/keys/regenerate_keys_dialog_view.js

29
lib/assets/javascripts/cartodb/fonts/lato_loader.js
Unescape View File

@ -1,29 +0,0 @@
var customInstall = window.config && window.config.cartodb_com_hosted;
var latoCSSUrl = cdb.config.get('assets_url') + '/stylesheets/fonts.css';
var opts = {};
if (customInstall) {
opts = {
custom: {
families: ['Lato'],
urls: [ latoCSSUrl ]
}
}
} else {
opts = {
fontinactive: function () {
WebFont.load({
custom: {
families: ['Lato'],
urls: [ latoCSSUrl ]
}
})
},
google: {
families: ['Lato:300,400,700,300italic,400italic:latin'],
timeout: 2000
}
}
}
WebFont.load(opts);

10
lib/build/files/js_files.js
Unescape View File

@ -14,7 +14,6 @@ module.exports = files = {
'vendor/assets/javascripts/jquery-ui/**/*.js',
'vendor/assets/javascripts/dropzone.js',
'vendor/assets/javascripts/dragster.js',
'lib/assets/javascripts/cartodb/fonts/lato_loader.js',
'lib/assets/javascripts/cartodb/old_common/video_player.js',
'lib/assets/javascripts/cartodb/old_common/dropdown_menu.js',
'lib/assets/javascripts/cartodb/old_common/error_stats.js',
@ -65,7 +64,6 @@ module.exports = files = {
'vendor/assets/javascripts/rails.js',
'vendor/assets/javascripts/ZeroClipboard.js',
'vendor/assets/javascripts/moment.js',
'lib/assets/javascripts/cartodb/fonts/lato_loader.js',
'lib/assets/javascripts/cartodb/old_common/dropdown_menu.js',
'lib/assets/javascripts/cartodb/old_common/error_stats.js',
'lib/assets/javascripts/cartodb/old_common/tipsy_tooltip.js',
@ -82,7 +80,6 @@ module.exports = files = {
'vendor/assets/javascripts/rails.js',
'vendor/assets/javascripts/filestyle.js',
'vendor/assets/javascripts/moment.js',
'lib/assets/javascripts/cartodb/fonts/lato_loader.js',
'vendor/assets/javascripts/backbone-model-file-upload.js',
'lib/assets/javascripts/cartodb/old_common/dropdown_menu.js',
'lib/assets/javascripts/cartodb/old_common/error_stats.js',
@ -100,7 +97,6 @@ module.exports = files = {
'vendor/assets/javascripts/rails.js',
'vendor/assets/javascripts/filestyle.js',
'vendor/assets/javascripts/moment.js',
'lib/assets/javascripts/cartodb/fonts/lato_loader.js',
'vendor/assets/javascripts/backbone-model-file-upload.js',
'lib/assets/javascripts/cartodb/old_common/dropdown_menu.js',
'lib/assets/javascripts/cartodb/old_common/error_stats.js',
@ -122,7 +118,6 @@ module.exports = files = {
'vendor/assets/javascripts/colorpicker.js',
'vendor/assets/javascripts/jquery-ui/**/*.js',
'vendor/assets/javascripts/tag-it.js',
'lib/assets/javascripts/cartodb/fonts/lato_loader.js',
'vendor/assets/javascripts/backbone-model-file-upload.js',
'lib/assets/javascripts/cartodb/old_common/dropdown_menu.js',
'lib/assets/javascripts/cartodb/old_common/error_stats.js',
@ -255,7 +250,6 @@ module.exports = files = {
'lib/assets/javascripts/cartodb/models/grantables.js',
'lib/assets/javascripts/cartodb/models/organization.js',
'lib/assets/javascripts/cartodb/models/like.js',
'lib/assets/javascripts/cartodb/fonts/lato_loader.js',
'lib/assets/javascripts/cartodb/old_common/dropdown_menu.js',
'lib/assets/javascripts/cartodb/old_common/utils.js',
'lib/assets/javascripts/cartodb/old_common/urls/url.js',
@ -280,7 +274,6 @@ module.exports = files = {
'lib/assets/javascripts/cartodb/models/filter.js',
'lib/assets/javascripts/cartodb/models/organization.js',
'lib/assets/javascripts/cartodb/models/vis.js',
'lib/assets/javascripts/cartodb/fonts/lato_loader.js',
'lib/assets/javascripts/cartodb/old_common/dropdown_menu.js',
'lib/assets/javascripts/cartodb/old_common/utils.js',
'lib/assets/javascripts/cartodb/old_common/urls/url.js',
@ -305,7 +298,6 @@ module.exports = files = {
'lib/assets/javascripts/cartodb/models/grantables.js',
'lib/assets/javascripts/cartodb/models/organization.js',
'lib/assets/javascripts/cartodb/models/like.js',
'lib/assets/javascripts/cartodb/fonts/lato_loader.js',
'lib/assets/javascripts/cartodb/old_common/dropdown_menu.js',
'lib/assets/javascripts/cartodb/old_common/utils.js',
'lib/assets/javascripts/cartodb/old_common/urls/url.js',
@ -330,7 +322,6 @@ module.exports = files = {
'lib/assets/javascripts/cartodb/models/grantables.js',
'lib/assets/javascripts/cartodb/models/organization.js',
'lib/assets/javascripts/cartodb/models/like.js',
'lib/assets/javascripts/cartodb/fonts/lato_loader.js',
'lib/assets/javascripts/cartodb/old_common/utils.js',
'lib/assets/javascripts/cartodb/old_common/dropdown_menu.js',
'lib/assets/javascripts/cartodb/old_common/urls/url.js',
@ -407,7 +398,6 @@ module.exports = files = {
'lib/assets/javascripts/cartodb/models/organization.js',
'lib/assets/javascripts/cartodb/models/like.js',
'lib/assets/javascripts/cartodb/models/export_map_model.js',
'lib/assets/javascripts/cartodb/fonts/lato_loader.js',
'lib/assets/javascripts/cartodb/old_common/dropdown_menu.js',
'lib/assets/javascripts/cartodb/old_common/urls/url.js',
'lib/assets/javascripts/cartodb/old_common/urls/dashboard_vis_url.js',

Write Preview
Loading…
Cancel
Save