Merge pull request #3463 from CartoDB/issue-3461

Fixing problem rendering Lato font
CartoDB · May 4, 2015 · 860df50 · 860df50
2 parents 7c0d0c9 + 0a31e76
commit 860df50
Show file tree

Hide file tree

Showing 9 changed files with 95 additions and 2 deletions.
diff --git a/NEWS.md b/NEWS.md
@@ -26,6 +26,7 @@ Bugfixes:
 * Deleted unused endpoints for POST/DELETE api/v1/maps
 * Avoid infinite recursion when renaming table [#3330](https://github.com/CartoDB/cartodb/pull/3330)
 * Script to delete inconsistent vizs [#3342](https://github.com/CartoDB/cartodb/pull/3342)
+* Fixed problem rendering Lato font [#3461](https://github.com/CartoDB/cartodb/issues/3461)
 
 3.10.0 (2015-04-08)
 -------------------

diff --git a/...sheets/new_common/lato-font-face.css.scss → ...stylesheets/fonts/lato-font-face.css.scss b/...sheets/new_common/lato-font-face.css.scss → ...stylesheets/fonts/lato-font-face.css.scss
@@ -1,5 +1,6 @@
 // Lato font face
 // --------------------------------------------------
+// This is the CSS fallback for Lato web font
 
 @import "compass/css3/font-face";
 

diff --git a/config/application.rb b/config/application.rb
@@ -111,6 +111,7 @@ class Application < Rails::Application
       db.css
       cartodb.css
       fonts_ie.css
+      fonts.css
       front.css
 
       editor.css

diff --git a/config/frontend.yml b/config/frontend.yml
@@ -1,2 +1,2 @@
 #This file defines the version of the frontend code that is going to be loaded.
-3.11.2
+3.11.10
diff --git a/lib/assets/javascripts/cartodb/fonts/lato_loader.js b/lib/assets/javascripts/cartodb/fonts/lato_loader.js
@@ -0,0 +1,29 @@
+var customInstall = cdb.config.get('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);
diff --git a/lib/build/files/css_files.js b/lib/build/files/css_files.js
@@ -144,6 +144,10 @@ module.exports = css_files = {
 
     // Overrides for older styles, to work as expected with new_common/default
     '<%= assets_dir %>/stylesheets/editor/table_overrides.css'
+  ],
+
+  fonts: [
+    '<%= assets_dir %>/stylesheets/fonts/lato-font-face.css'
   ]
 
 };

diff --git a/lib/build/files/js_files.js b/lib/build/files/js_files.js
@@ -3,6 +3,7 @@ var _ = require('underscore');
 module.exports = files = {
 
   new_dashboard_deps: [
+    'vendor/assets/javascripts/webfontloader.js',
     'vendor/assets/javascripts/d3.v2.js',
     'vendor/assets/javascripts/jquery.tipsy.js',
     'vendor/assets/javascripts/rails.js',
@@ -13,6 +14,7 @@ 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/common/video_player.js',
     'lib/assets/javascripts/cartodb/common/dropdown_menu.js',
     'lib/assets/javascripts/cartodb/common/error_stats.js',
@@ -119,10 +121,12 @@ module.exports = files = {
   ],
 
   new_keys_deps: [
+    'vendor/assets/javascripts/webfontloader.js',
     'vendor/assets/javascripts/jquery.tipsy.js',
     '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/common/dropdown_menu.js',
     'lib/assets/javascripts/cartodb/common/error_stats.js',
     'lib/assets/javascripts/cartodb/common/tipsy_tooltip.js',
@@ -134,10 +138,12 @@ module.exports = files = {
   ],
 
   account_deps: [
+    'vendor/assets/javascripts/webfontloader.js',
     'vendor/assets/javascripts/jquery.tipsy.js',
     '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/common/dropdown_menu.js',
     'lib/assets/javascripts/cartodb/common/error_stats.js',
@@ -150,10 +156,12 @@ module.exports = files = {
   ],
 
   new_organization_deps: [
+    'vendor/assets/javascripts/webfontloader.js',
     'vendor/assets/javascripts/jquery.tipsy.js',
     '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/common/dropdown_menu.js',
     'lib/assets/javascripts/cartodb/common/error_stats.js',
@@ -287,12 +295,14 @@ module.exports = files = {
   ],
 
   new_public_dashboard_deps: [
+    'vendor/assets/javascripts/webfontloader.js',
     'lib/assets/javascripts/cartodb/public/authenticated_user.js',
     'lib/assets/javascripts/cartodb/models/cartodb_layer.js',
     'lib/assets/javascripts/cartodb/models/map.js',
     'lib/assets/javascripts/cartodb/models/user.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/common/dropdown_menu.js',
     'lib/assets/javascripts/cartodb/common/urls/url.js',
     'lib/assets/javascripts/cartodb/common/urls/dashboard_vis_url.js',
@@ -352,12 +362,14 @@ module.exports = files = {
   ],
 
   public_map_deps: [
+    'vendor/assets/javascripts/webfontloader.js',
     'lib/assets/javascripts/cartodb/public/authenticated_user.js',
     'lib/assets/javascripts/cartodb/models/cartodb_layer.js',
     'lib/assets/javascripts/cartodb/models/map.js',
     'lib/assets/javascripts/cartodb/models/user.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/common/dropdown_menu.js',
     'lib/assets/javascripts/cartodb/common/urls/url.js',
     'lib/assets/javascripts/cartodb/common/urls/dashboard_vis_url.js',

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cartodb-ui",
-  "version": "3.11.2",
+  "version": "3.11.10",
   "description": "CartoDB UI frontend",
   "repository": {
     "type": "git",