Permalink
Browse files

Merge branch 'develop' of github.com:CartoDB/cartodb.js into develop

  • Loading branch information...
2 parents 3c2d127 + ecf511f commit 6aaed51ae011009ec68427527592b9690c351652 @johnHackworth johnHackworth committed Dec 31, 2012
View
@@ -5,7 +5,7 @@ CSS_FILES = $(wildcard themes/css/*.css)
CSS_FILES_IE = $(wildcard themes/css/ie/*.css)
#dist: dist/cartodb.js dist/cartodb.full.js themes
-dist: dist/cartodb.js themes
+dist: dist/cartodb.js dist/cartodb.css dist/cartodb.ie.css
dist_folder:
@@ -18,6 +18,12 @@ dist/cartodb.uncompressed.js: dist_folder
dist/cartodb.js: dist/cartodb.uncompressed.js
$(UGLIFYJS) dist/cartodb.uncompressed.js > dist/cartodb.js
+dist/cartodb.css: css
+ cp themes/css/cartodb.css dist
+
+dist/cartodb.ie.css: css
+ cp themes/css/cartodb.ie.css dist
+
clean:
rm -rf dist/*
View
@@ -1,4 +1,3 @@
-
cartodb.js
==========
@@ -18,24 +17,21 @@ quick start
<![endif]-->
- <script src="https://maps.googleapis.com/maps/api/js?sensor=false"></script>
+ <script src="http://maps.googleapis.com/maps/api/js?sensor=false"></script>
<script src="http://libs.cartocdn.com/cartodb.js/v2/cartodb.js"></script>
<!-- use these cartodb.css links if you are using https -->
<!--
- <link rel="stylesheet" href="https://d3voyrscnb0slx.cloudfront.net/cartodb.js/v2/themes/cartodb.css" />
+ <link rel="stylesheet" href="http://libs.cartocdn.com/cartodb.js/v2/themes/css/cartodb.css" />
<!--[if lte IE 8]>
- <link rel="stylesheet" href="https://d3voyrscnb0slx.cloudfront.net/cartodb.js/v2/themes/css/cartodb.ie.css" />
+ <link rel="stylesheet" href="http://libs.cartocdn.com/cartodb.js/v2/themes/css/cartodb.ie.css" />
<![endif]-->
-
-->
- <!-- use this cartodb.js links if you are using https -->
- <!--
- <script src="https://d3voyrscnb0slx.cloudfront.net/cartodb.js/v2/cartodb.js"></script>
- -->
+ <!-- use this cartodb.js link if you are using https -->
+ <!-- script src="http://d3voyrscnb0slx.cloudfront.net/cartodb.js/v2/cartodb.js"></script -->
```
@@ -84,6 +80,16 @@ quick start
```
+examples
+========
+
+ - [Load a layer with google maps](http://cartodb.github.com/cartodb.js/examples/gmaps.html)
+ - [Load a layer with Leaflet](http://cartodb.github.com/cartodb.js/examples/leaflet.html)
+ - [Show a complete visualization](http://cartodb.github.com/cartodb.js/examples/easy.html)
+ - [A visulization with a layer selector](http://cartodb.github.com/cartodb.js/examples/layer_selector.html)
+ - [How to create a custom infowindow](http://cartodb.github.com/cartodb.js/examples/custom_infowindow.html)
+ - [The Hobbit filming location paths](http://cartodb.github.com/cartodb.js/examples/TheHobbitLocations/) a full example with some widgets
+
next steps
==========
Oops, something went wrong.

0 comments on commit 6aaed51

Please sign in to comment.