Merge pull request #10744 from CartoDB/10325-wms

Fix list of layers in Add basemap WMS URL tab

NEWS.md

@@ -71,6 +71,7 @@ sudo make install
 * Forward compatibility for infowindows at Builder
 * Several auth_token related fixes
 * New builder default geometry styles are now properly initialized at the backend upon dataset import.
+* Fixed list of layers in Add basemap WMS URL tab
 
 3.13.0 (2016-XX-XX)
 -------------------

app/assets/stylesheets/editor-3/custom-basemap-dialog.css.scss

@@ -23,6 +23,7 @@
 .WMSSSelectLayer-Filter {
   width: 900px;
   margin: auto;
+  margin-top: -42px;
   z-index: 0;
 }
 

app/assets/stylesheets/editor-3/scroll-view.css.scss

@@ -25,6 +25,10 @@
   }
 }
 
+.ScrollView--with-navigation {
+  margin-top: 0;
+}
+
 .ScrollView--horizontal {
 
   &,

lib/assets/javascripts/cartodb3/components/modals/add-basemap/tabs.tpl

@@ -10,9 +10,7 @@
   </ul>
 </div>
 <div class="Modal-inner Modal-inner--with-navigation">
-  <div class="ScrollView">
+  <div class="ScrollView ScrollView--with-navigation">
-    <div class="ScrollView-wrapper">
+    <div class="ScrollView-content js-tab-content"></div>
-      <div class="ScrollView-content js-tab-content"></div>
-    </div>
   </div>
-</div>
+</div>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "cartodb-ui",
-  "version": "4.5.10",
+  "version": "4.5.11",
   "description": "CARTO UI frontend",
   "repository": {
     "type": "git",