Merge pull request #6540 from CartoDB/3.12.X_fix-missing-icons

3.12.x fix missing icons

app/assets/stylesheets/editor/select.css.scss

@@ -1,7 +1,3 @@
-@import "../variables/mixins";
-@import "../variables/colors";
-@import "../variables/sizes";
-
 // Select combo represents the "enhanced" <select> dropdown combo selector
 // Expected to be typically used together with a cdb.admin.Combo view, e.g.
 //   new cdb.forms.Combo({
@@ -9,6 +5,11 @@
 //      …
 //
 // --------------------------------------------------
+
+@import '../variables/mixins';
+@import '../variables/colors';
+@import '../variables/sizes';
+
 .Select { width: 100% }
 .Select .select2-container { background: none }
 .Select .select2-container:hover .select2-choice { border-color: $cStructure-mainLine !important }
@@ -32,7 +33,7 @@
 
     div b:before {
       // since can't use CDB-IconFont here, we'll inline the CDB-IconFont styles here
-      font-family:'CartoIcon';
+      font-family: 'CartoIcon';
       display: inline-block;
       font-style: normal;
       font-weight: normal;
@@ -44,7 +45,7 @@
       position: absolute;
       top: 14px;
       right: 12px;
-      content: "\E048"; // ChevronDown
+      content: '\E04C'; // CDB-IconFont-chevronDown
       font-size: 9px;
       color: $cTypography-paragraphs;
     }

lib/assets/javascripts/cartodb/common/dialogs/create/footer/privacy_toggler_view.js

@@ -1,4 +1,5 @@
 var cdb = require('cartodb.js');
+var $ = require('jquery');
 
 /**
  *  Change the privacy of the new dataset.
@@ -8,19 +9,18 @@ var cdb = require('cartodb.js');
  */
 
 module.exports = cdb.core.View.extend({
-
   events: {
     'click': '_onClick'
   },
 
-  initialize: function() {
+  initialize: function () {
     this.user = this.options.user;
     this.createModel = this.options.createModel;
     this.template = cdb.templates.getTemplate('common/dialogs/create/footer/privacy_toggler_template');
     this._initBinds();
   },
 
-  render: function() {
+  render: function () {
     this.clearSubViews();
     this.$el.empty();
 
@@ -28,7 +28,7 @@ module.exports = cdb.core.View.extend({
       var canChangePrivacy = this.user.canCreatePrivateDatasets();
       var privacy = this.model.get('privacy');
       var nexPrivacy = privacy === "PUBLIC" ? "PRIVATE" : "PUBLIC";
-      var icon = privacy === "PUBLIC" ? 'Unlock' : 'Lock';
+      var icon = privacy === "PUBLIC" ? 'unlock' : 'lock';
       var upgradeUrl = cdb.config.get('upgrade_url') || window.upgrade_url;
       var canUpgrade = !cdb.config.get('custom_com_hosted') && !canChangePrivacy && upgradeUrl;
 
@@ -49,27 +49,27 @@ module.exports = cdb.core.View.extend({
     return this;
   },
 
-  _initBinds: function() {
+  _initBinds: function () {
     this.model.bind('change:privacy', this.render, this);
   },
 
-  _initViews: function() {
+  _initViews: function () {
     // Tooltip
     this.addView(
       new cdb.common.TipsyTooltip({
         el: this.$('.js-toggler'),
         html: true,
-        title: function() {
+        title: function () {
           return $(this).attr('data-title');
         }
       })
     );
   },
 
-  _onClick: function() {
+  _onClick: function () {
     if (this.user.canCreatePrivateDatasets()) {
       var privacy = this.model.get('privacy');
-      this.model.set('privacy', privacy === "PUBLIC" ? "PRIVATE" : "PUBLIC" );
+      this.model.set('privacy', privacy === 'PUBLIC' ? 'PRIVATE' : 'PUBLIC');
       return;
     }
   }

lib/build/files/css_files.js

@@ -101,7 +101,7 @@ module.exports = css_files = {
   ],
 
   cartodb: [
-    '<%= assets_dir %>/stylesheets/vendor/cartodb.css',
+    '<%= assets_dir %>/stylesheets/vendor/cartodb.css'
   ],
 
   table: [
@@ -134,6 +134,7 @@ module.exports = css_files = {
     '<%= assets_dir %>/stylesheets/common/flash-message.css',
     '<%= assets_dir %>/stylesheets/common/tooltip.css',
     '<%= assets_dir %>/stylesheets/common/logo.css',
+    '<%= assets_dir %>/stylesheets/common/cdb-icon-font.css',
     '<%= assets_dir %>/stylesheets/fonts/proximanova-font-face.css',
     '<%= assets_dir %>/stylesheets/sessions/*.css'
   ],

package.json

@@ -1,6 +1,6 @@
 {
   "name": "cartodb-ui",
-  "version": "3.23.26",
+  "version": "3.23.31",
   "description": "CartoDB UI frontend",
   "repository": {
     "type": "git",