diff --git a/assets/stylesheets/common/create/listing/imports_options.scss b/assets/stylesheets/common/create/listing/imports_options.scss index 133222bd91..f303258f80 100644 --- a/assets/stylesheets/common/create/listing/imports_options.scss +++ b/assets/stylesheets/common/create/listing/imports_options.scss @@ -127,24 +127,15 @@ $w: $sLayout-width; } @mixin importIcon($name) { - .ImportOptions__item .is-#{$name}, - .SelectedImport__header .is-#{$name} { + .ImportOptions__item .is-#{$name} { display: block; width: 44px; height: 20px; + margin-bottom: 8px; background-image: url($assetsDir + '/images/layout/connectors/#{$name}.svg'); background-repeat: no-repeat; - } - - .ImportOptions__item .is-#{$name} { - margin-bottom: 8px; background-position: center center; } - - .SelectedImport__header .is-#{$name} { - margin-right: 8px; - background-position: right center; - } } @include importIcon(box); @@ -170,6 +161,10 @@ $w: $sLayout-width; border-bottom: 1px solid $cStructure-mainLine; } + &__icon { + margin-right: 8px; + } + &__back { position: absolute; left: 0; diff --git a/lib/assets/javascripts/builder/components/modals/add-layer/content/imports/selected-import/selected-import-header-view.js b/lib/assets/javascripts/builder/components/modals/add-layer/content/imports/selected-import/selected-import-header-view.js index 040ef7f673..89e7096c32 100755 --- a/lib/assets/javascripts/builder/components/modals/add-layer/content/imports/selected-import/selected-import-header-view.js +++ b/lib/assets/javascripts/builder/components/modals/add-layer/content/imports/selected-import/selected-import-header-view.js @@ -25,7 +25,8 @@ module.exports = CoreView.extend({ this.$el.html( template({ title: this._title, - name: this._name + name: this._name, + __ASSETS_PATH__: '__ASSETS_PATH__' }) ); return this; diff --git a/lib/assets/javascripts/builder/components/modals/add-layer/content/imports/selected-import/selected-import-header.tpl b/lib/assets/javascripts/builder/components/modals/add-layer/content/imports/selected-import/selected-import-header.tpl index 6538721f92..2a3efa167b 100755 --- a/lib/assets/javascripts/builder/components/modals/add-layer/content/imports/selected-import/selected-import-header.tpl +++ b/lib/assets/javascripts/builder/components/modals/add-layer/content/imports/selected-import/selected-import-header.tpl @@ -2,6 +2,6 @@ - + <%= _t('components.modals.add-layer.imports.header-alt', { brand: cdb.core.sanitize.html(title)}) %> <%= _t('components.modals.add-layer.imports.header', { brand: cdb.core.sanitize.html(title)}) %> \ No newline at end of file diff --git a/lib/assets/javascripts/locale/en.json b/lib/assets/javascripts/locale/en.json index c0939d1b4d..a45e0ed9b7 100644 --- a/lib/assets/javascripts/locale/en.json +++ b/lib/assets/javascripts/locale/en.json @@ -1234,6 +1234,7 @@ "add-layer-error": "Could not add layer", "imports": { "header": "Connect with %{brand}", + "header-alt": "%{brand} connector logo", "ask-for-demo": "ask for demo", "contact-us": "Contact us", "request-beta": "Request beta access", diff --git a/package.json b/package.json index b534059c7b..dc13b2a021 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "cartodb-ui", - "version": "1.0.0-assets.140-grid-1", + "version": "1.0.0-assets.140-grid-2", "description": "CARTO UI frontend", "repository": { "type": "git", diff --git a/webpack/v4/webpack.base.config.js b/webpack/v4/webpack.base.config.js index 50d7b8cffd..1efdc2ed6d 100644 --- a/webpack/v4/webpack.base.config.js +++ b/webpack/v4/webpack.base.config.js @@ -37,7 +37,8 @@ module.exports = { new webpack.DefinePlugin({ __IN_DEV__: JSON.stringify(false), __ENV__: JSON.stringify('prod'), - __ASSETS_VERSION__: JSON.stringify(version) + __ASSETS_VERSION__: JSON.stringify(version), + __ASSETS_PATH__: JSON.stringify(`${http_path_prefix}/assets/${version}`) }), new MiniCssExtractPlugin({