Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/feature/CDB-788' into release/2.4.0
Browse files Browse the repository at this point in the history
  • Loading branch information
@rafacas
rafacas committed Nov 6, 2013
2 parents 130044a + 3d2a473 commit 8a08c8d
Show file tree
Hide file tree
Showing 6 changed files with 59 additions and 13 deletions.
21 changes: 19 additions & 2 deletions app/assets/stylesheets/map/map.css.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ div.map {

div.dropdown.basemap {

width: 648px;
width: 861px;
border: 1px solid #999999;

.custom {
Expand Down Expand Up @@ -154,18 +154,35 @@ div.map {

&:hover { background: none; }

&.add_basemap > a {
small, &:hover small {
color: #397DB8;
@include opacity(.5);
}
}

&.map_background > a .name {
margin: 5px 0 0 5px;
}

& > a {
display:block;
padding: 11px 10px 11px 0;

line-height: normal;
@include clearfix();

small { display:block; margin: 0 0 0 29px; font-size: 9px; color: #AAAAAA; }

&:hover small {
color: #AAAAAA;
}

.name {
float:left;
font-size:13px;
width: 150px;
margin: 5px 0 0 5px;
margin: 0 0 0 5px;

text-overflow:ellipsis;
white-space: nowrap;
Expand Down
1 change: 1 addition & 0 deletions config/custom_basemaps/basemap-dark.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"id":"88826ca6-3d56-11e3-bbff-0f80769a2491","version":"0.1.0","title":"dark","description":null,"url":null,"map_provider":"leaflet","bounds":[[25.64152637306577,-109.423828125],[45.67548217560647,-53.876953125]],"center":"[36.29741818650811, -81.650390625]","zoom":5,"updated_at":"2013-11-04T14:06:12+00:00","layers":[{"options":{"type":"Plain","base_type":"plain","className":"plain","color":"#111111","image":"","maxZoom":28,"id":516421,"order":0},"infowindow":null,"id":516421,"order":0,"type":"background"},{"type":"layergroup","options":{"user_name":"basemaps01","tiler_protocol":"http","tiler_domain":"cartodb.com","tiler_port":"80","sql_api_protocol":"https","sql_api_domain":"cartodb.com","sql_api_endpoint":"/api/v1/sql","sql_api_port":443,"cdn_url":{"http":"api.cartocdn.com","https":"cartocdn.global.ssl.fastly.net"},"layer_definition":{"stat_tag":"88826ca6-3d56-11e3-bbff-0f80769a2491","version":"1.0.1","layers":[{"id":516446,"type":"CartoDB","infowindow":{"template_name":"table/views/infowindow_light","fields":[],"template":"<div class=\"cartodb-popup\">\n <a href=\"#close\" class=\"cartodb-popup-close-button close\">x</a>\n <div class=\"cartodb-popup-content-wrapper\">\n <div class=\"cartodb-popup-content\">\n {{#content.fields}}\n {{#title}}<h4>{{title}}</h4>{{/title}}\n {{#value}}\n <p {{#type}}class=\"{{ type }}\"{{/type}}>{{{ value }}}</p>\n {{/value}}\n {{^value}}\n <p class=\"empty\">null</p>\n {{/value}}\n {{/content.fields}}\n </div>\n </div>\n <div class=\"cartodb-popup-tip-container\"></div>\n</div>\n"},"legend":{"type":null,"show_title":false,"title":""},"order":1,"options":{"sql":"select * from bkgpolygon","layer_name":"background","cartocss":"/** simple visualization */\n\n#bkgpolygon{\n polygon-fill: #111111;\n polygon-opacity: 1;\n line-width: 1;\n line-color: #FFF;\n line-opacity: 1;\n}","cartocss_version":"2.1.1","interactivity":"cartodb_id"}},{"id":516422,"type":"CartoDB","infowindow":{"template_name":"table/views/infowindow_light","fields":[],"template":"<div class=\"cartodb-popup\">\n <a href=\"#close\" class=\"cartodb-popup-close-button close\">x</a>\n <div class=\"cartodb-popup-content-wrapper\">\n <div class=\"cartodb-popup-content\">\n {{#content.fields}}\n {{#title}}<h4>{{title}}</h4>{{/title}}\n {{#value}}\n <p {{#type}}class=\"{{ type }}\"{{/type}}>{{{ value }}}</p>\n {{/value}}\n {{^value}}\n <p class=\"empty\">null</p>\n {{/value}}\n {{/content.fields}}\n </div>\n </div>\n <div class=\"cartodb-popup-tip-container\"></div>\n</div>\n"},"legend":{"type":null,"show_title":false,"title":""},"order":2,"options":{"sql":"select * from ne_10m_bathymetry_l_0","layer_name":"ne 10m bathymetry","cartocss":"/** simple visualization */\n\n#ne_10m_bathymetry_l_0{\n polygon-fill: #111111;\n polygon-opacity: 1;\n line-width: 0;\n line-color: #FFF;\n line-opacity: 1;\n polygon-comp-op: multiply;\n}","cartocss_version":"2.1.1","interactivity":"cartodb_id"}},{"id":516423,"type":"CartoDB","infowindow":{"template_name":"table/views/infowindow_light","fields":[],"template":"<div class=\"cartodb-popup\">\n <a href=\"#close\" class=\"cartodb-popup-close-button close\">x</a>\n <div class=\"cartodb-popup-content-wrapper\">\n <div class=\"cartodb-popup-content\">\n {{#content.fields}}\n {{#title}}<h4>{{title}}</h4>{{/title}}\n {{#value}}\n <p {{#type}}class=\"{{ type }}\"{{/type}}>{{{ value }}}</p>\n {{/value}}\n {{^value}}\n <p class=\"empty\">null</p>\n {{/value}}\n {{/content.fields}}\n </div>\n </div>\n <div class=\"cartodb-popup-tip-container\"></div>\n</div>\n"},"legend":{"type":null,"show_title":false,"title":""},"order":3,"options":{"sql":"select * from ne_10m_bathymetry_j_1000","layer_name":"ne_10m_bathymetry_j_1000","cartocss":"/** simple visualization */\n\n#ne_10m_bathymetry_j_1000{\n polygon-fill: #FFFFFF;\n polygon-opacity: 0.01;\n line-width: 0;\n line-color: #FFF;\n line-opacity: 1;\n}","cartocss_version":"2.1.1","interactivity":"cartodb_id"}},{"id":516424,"type":"CartoDB","infowindow":{"template_name":"table/views/infowindow_light","fields":[],"template":"<div class=\"cartodb-popup\">\n <a href=\"#close\" class=\"cartodb-popup-close-button close\">x</a>\n <div class=\"cartodb-popup-content-wrapper\">\n <div class=\"cartodb-popup-content\">\n {{#content.fields}}\n {{#title}}<h4>{{title}}</h4>{{/title}}\n {{#value}}\n <p {{#type}}class=\"{{ type }}\"{{/type}}>{{{ value }}}</p>\n {{/value}}\n {{^value}}\n <p class=\"empty\">null</p>\n {{/value}}\n {{/content.fields}}\n </div>\n </div>\n <div class=\"cartodb-popup-tip-container\"></div>\n</div>\n"},"legend":{"type":null,"show_title":false,"title":""},"order":4,"options":{"sql":"select * from ne_10m_bathymetry_h_3000","layer_name":"ne_10m_bathymetry_h_3000","cartocss":"/** simple visualization */\n\n#ne_10m_bathymetry_h_3000{\n polygon-fill: #FFFFFF;\n polygon-opacity: 0.01;\n line-width: 0;\n line-color: #FFF;\n line-opacity: 1;\n}","cartocss_version":"2.1.1","interactivity":"cartodb_id"}},{"id":516425,"type":"CartoDB","infowindow":{"template_name":"table/views/infowindow_light","fields":[],"template":"<div class=\"cartodb-popup\">\n <a href=\"#close\" class=\"cartodb-popup-close-button close\">x</a>\n <div class=\"cartodb-popup-content-wrapper\">\n <div class=\"cartodb-popup-content\">\n {{#content.fields}}\n {{#title}}<h4>{{title}}</h4>{{/title}}\n {{#value}}\n <p {{#type}}class=\"{{ type }}\"{{/type}}>{{{ value }}}</p>\n {{/value}}\n {{^value}}\n <p class=\"empty\">null</p>\n {{/value}}\n {{/content.fields}}\n </div>\n </div>\n <div class=\"cartodb-popup-tip-container\"></div>\n</div>\n"},"legend":{"type":null,"show_title":false,"title":""},"order":5,"options":{"sql":"select * from ne_10m_admin_0_countries_lakes","layer_name":"ne_10m_admin_0_countries_lakes","cartocss":"#ne_10m_admin_0_countries_lakes{\n polygon-fill: #222;\n polygon-opacity: 1;\n line-width: 0.7;\n line-color: #070707;\n line-opacity: 1;\n\n [zoom >=1]{\n line-width: 0.3; \t\n }\n \n [zoom >= 4]{\n\t::glow{\n\t line-width: 3.2;\n\t line-color:#fff;\n line-opacity: 0.03;\n ::line{\n line-color: #070707;\n\t line-width: 1.2;\n \t }\n }\n }\n \n [zoom >= 5]{\n\t::glow{\n\t line-width: 4;\n\t line-color:#fff;\n line-opacity: 0.03;\n ::line{\n line-color: #070707;\n\t line-width: 1.6;\n \t }\n }\n }\n \n [zoom >= 6]{\n ::glow{\n\t line-width: 4;\n\t line-color:#ffffff;\n line-opacity: 0.03;\n ::line{\n line-color: #070707;\n\t line-width: 1.8;\n \t }\n }\n }\n\n [zoom >= 7]{\n ::glow{\n\t line-width: 4;\n\t line-color:#ffffff;\n line-opacity: 0.04;\n ::line{\n line-color: #070707;\n\t line-width: 2;\n \t }\n }\n }\n \n [zoom >= 8]{\n ::glow{\n\t line-width: 5.4;\n\t line-color:#ffffff;\n line-opacity: 0.04; \n ::line{\n line-color: #070707;\n\t line-width: 3;\n \t }\n }\n }\n}\n\n#ne_10m_admin_0_countries_lakes::labels{\n [zoom <= 5]{\n text-name: [name];\n text-face-name: 'DejaVu Sans Book';\n text-size: 10;\n text-fill: #666;\n text-allow-overlap: false;\n text-halo-fill: #111;\n text-halo-radius: 1.3;\n text-min-path-length: 26;\n [zoom = 5]{\n \t text-size: 12; \n }\n }\n}","cartocss_version":"2.1.1","interactivity":"cartodb_id"}},{"id":516426,"type":"CartoDB","infowindow":{"template_name":"table/views/infowindow_light","fields":[],"template":"<div class=\"cartodb-popup\">\n <a href=\"#close\" class=\"cartodb-popup-close-button close\">x</a>\n <div class=\"cartodb-popup-content-wrapper\">\n <div class=\"cartodb-popup-content\">\n {{#content.fields}}\n {{#title}}<h4>{{title}}</h4>{{/title}}\n {{#value}}\n <p {{#type}}class=\"{{ type }}\"{{/type}}>{{{ value }}}</p>\n {{/value}}\n {{^value}}\n <p class=\"empty\">null</p>\n {{/value}}\n {{/content.fields}}\n </div>\n </div>\n <div class=\"cartodb-popup-tip-container\"></div>\n</div>\n"},"legend":{"type":null,"show_title":false,"title":""},"order":6,"options":{"sql":"select * from ne_10m_urban_areas","layer_name":"ne_10m_urban_areas","cartocss":"/** simple visualization */\n\n#ne_10m_urban_areas{\n [zoom >= 5]{\n line-width: 0;\n line-color: #FFF;\n line-opacity: 1;\n polygon-opacity: 0;\n polygon-comp-op: multiply;\n polygon-pattern-file: url(https://s3.amazonaws.com/com.cartodb.users-assets.production/production/basemaps01/assets/20131016101601Unknown.png); \n polygon-pattern-opacity: 0.8;\n }\n}","cartocss_version":"2.1.1","interactivity":"cartodb_id"}},{"id":516427,"type":"CartoDB","infowindow":{"template_name":"table/views/infowindow_light","fields":[],"template":"<div class=\"cartodb-popup\">\n <a href=\"#close\" class=\"cartodb-popup-close-button close\">x</a>\n <div class=\"cartodb-popup-content-wrapper\">\n <div class=\"cartodb-popup-content\">\n {{#content.fields}}\n {{#title}}<h4>{{title}}</h4>{{/title}}\n {{#value}}\n <p {{#type}}class=\"{{ type }}\"{{/type}}>{{{ value }}}</p>\n {{/value}}\n {{^value}}\n <p class=\"empty\">null</p>\n {{/value}}\n {{/content.fields}}\n </div>\n </div>\n <div class=\"cartodb-popup-tip-container\"></div>\n</div>\n"},"legend":{"type":null,"show_title":false,"title":""},"order":7,"options":{"sql":"select * from ne_10m_rivers_lake_centerlines","layer_name":"ne_10m_rivers_lake_centerlines","cartocss":"/** simple visualization */\n\n#ne_10m_rivers_lake_centerlines{\n [zoom >= 7]{\n ::glow{\n line-width: .8;\n line-color: #fff;\n line-opacity: 0.02; \n }\n ::line{\n line-width: 0.7;\n line-color: #070707;\n line-opacity: 0.6; \n }\n }\n [zoom >= 8]{\n ::glow{\n line-width: 2;\n line-color: #fff;\n line-opacity: 0.02; \n }\n ::line{\n line-width: 0.8;\n line-color: #070707;\n line-opacity: 1; \n }\n }\n}","cartocss_version":"2.1.1","interactivity":"cartodb_id"}},{"id":516428,"type":"CartoDB","infowindow":{"template_name":"table/views/infowindow_light","fields":[],"template":"<div class=\"cartodb-popup\">\n <a href=\"#close\" class=\"cartodb-popup-close-button close\">x</a>\n <div class=\"cartodb-popup-content-wrapper\">\n <div class=\"cartodb-popup-content\">\n {{#content.fields}}\n {{#title}}<h4>{{title}}</h4>{{/title}}\n {{#value}}\n <p {{#type}}class=\"{{ type }}\"{{/type}}>{{{ value }}}</p>\n {{/value}}\n {{^value}}\n <p class=\"empty\">null</p>\n {{/value}}\n {{/content.fields}}\n </div>\n </div>\n <div class=\"cartodb-popup-tip-container\"></div>\n</div>\n"},"legend":{"type":null,"show_title":false,"title":""},"order":8,"options":{"sql":"select * from ne_10m_lakes","layer_name":"ne_10m_lakes","cartocss":"/** simple visualization */\n\n#ne_10m_lakes{\n polygon-fill: #191919;\n line-opacity: 0;\n polygon-opacity: 0; \n [zoom >= 7]{\n line-opacity: 1;\n line-width: 0.6;\n line-color: #070707;\n polygon-opacity: 1;\n }\n}","cartocss_version":"2.1.1","interactivity":"cartodb_id"}},{"id":516429,"type":"CartoDB","infowindow":{"fields":[],"template_name":"table/views/infowindow_light","template":"<div class=\"cartodb-popup\">\n <a href=\"#close\" class=\"cartodb-popup-close-button close\">x</a>\n <div class=\"cartodb-popup-content-wrapper\">\n <div class=\"cartodb-popup-content\">\n {{#content.fields}}\n {{#title}}<h4>{{title}}</h4>{{/title}}\n {{#value}}\n <p {{#type}}class=\"{{ type }}\"{{/type}}>{{{ value }}}</p>\n {{/value}}\n {{^value}}\n <p class=\"empty\">null</p>\n {{/value}}\n {{/content.fields}}\n </div>\n </div>\n <div class=\"cartodb-popup-tip-container\"></div>\n</div>\n","alternative_names":{}},"legend":{"type":null,"show_title":false,"title":""},"order":9,"options":{"sql":"SELECT * FROM ne_10m_roads WHERE type IN ('Unknown','Road','Major Highway','Secondary Highway','Ferry Route','Beltway','Track') OR type IS NULL","layer_name":"ne_10m_roads","cartocss":"/** simple visualization */\n\n#ne_10m_roads::roads{\n [zoom >= 6]{\n [type = 'Major Highway']{\n line-width: .8;\n line-color: #191919;\n }\n }\n [zoom >= 7]{\n [type = 'Major Highway']{\n line-width: 1;\n line-color: #151515;\n }\n [type = 'Secondary Highway']{\n line-width: 0.5;\n line-color: #151515;\n }\n }\n [zoom >= 8]{\n [type = 'Major Highway']{\n ::glow{\n line-width: 4;\n line-color: #fff;\n line-opacity: 0.1;\n }\n ::line{\n line-width: 2.8;\n line-color: #111; \n }\n }\n [type = 'Secondary Highway']{\n ::glow{\n line-width: 2.8;\n line-color: #fff;\n line-opacity: 0.1;\n }\n ::line{\n line-width: 2;\n line-color: #111; \n }\n }\n }\n [zoom >= 9]{\n [type = 'Major Highway']{\n ::glow{\n line-width: 4.2;\n line-color: #fff;\n line-opacity: 0.15;\n }\n ::line{\n line-width: 3.6;\n line-color: #111; \n }\n }\n [type = 'Secondary Highway']{\n ::glow{\n line-width: 3;\n line-color: #fff;\n line-opacity: 0.1;\n }\n ::line{\n line-width: 2.4;\n line-color: #111; \n }\n }\n }\n [zoom >= 10]{\n [type = 'Major Highway']{\n ::glow{\n line-width: 4.6;\n line-color: #fff;\n line-opacity: 0.1;\n }\n ::line{\n line-width: 3.2;\n line-color: #111; \n }\n }\n [type = 'Secondary Highway']{\n ::glow{\n line-width: 3.4;\n line-color: #fff;\n line-opacity: 0.1;\n }\n ::line{\n line-width: 2.4;\n line-color: #111; \n }\n }\n }\n}\n#ne_10m_roads::ferry{\n [zoom >= 7]{\n [type = 'Ferry Route']{\n line-width: 1;\n line-color: #ABABAB;\n line-dasharray: 5,5;\n line-opacity: 0.15;\n } \n }\n}","cartocss_version":"2.1.1","interactivity":"cartodb_id"}},{"id":516430,"type":"CartoDB","infowindow":{"template_name":"table/views/infowindow_light","fields":[],"template":"<div class=\"cartodb-popup\">\n <a href=\"#close\" class=\"cartodb-popup-close-button close\">x</a>\n <div class=\"cartodb-popup-content-wrapper\">\n <div class=\"cartodb-popup-content\">\n {{#content.fields}}\n {{#title}}<h4>{{title}}</h4>{{/title}}\n {{#value}}\n <p {{#type}}class=\"{{ type }}\"{{/type}}>{{{ value }}}</p>\n {{/value}}\n {{^value}}\n <p class=\"empty\">null</p>\n {{/value}}\n {{/content.fields}}\n </div>\n </div>\n <div class=\"cartodb-popup-tip-container\"></div>\n</div>\n"},"legend":{"type":"none","show_title":false,"title":""},"order":10,"options":{"sql":"select * from ne_10m_populated_places_simple","layer_name":"ne_10m_populated_places_simple","cartocss":"\n\n#ne_10m_populated_places_simple::labels{\n [zoom >= 6]{\n text-name: [name];\n text-face-name: 'DejaVu Sans Book';\n text-size: 12; \n text-fill: #666;\n text-allow-overlap: true;\n text-halo-fill: #070707;\n text-halo-radius: 1.3;\n [scalerank > 2]{\n text-opacity: 0;\n }\n }\n [zoom >= 7]{\n text-allow-overlap: false;\n text-min-distance: 20; \n text-halo-radius: 1.5;\n [scalerank > 2]{\n text-opacity: 1;\n text-size: 10;\n }\n }\n}","cartocss_version":"2.1.1","interactivity":"cartodb_id"}}]}}}],"overlays":[{"type":"zoom","order":null,"options":null,"template":"<a class=\"zoom_in\">+</a><a class=\"zoom_out\">-</a>"},{"type":"loader","order":null,"options":null,"template":"<div class=\"loader\"></div>"}]}
Loading

0 comments on commit 8a08c8d

Please sign in to comment.