Moved dist to dist/internal

CartoDB · Nov 14, 2017 · fd2be13 · fd2be13
1 parent b184601
commit fd2be13
Show file tree

Hide file tree

Showing 28 changed files with 53 additions and 60 deletions.
diff --git a/examples/analysis_test.html b/examples/analysis_test.html
@@ -5,7 +5,7 @@
     <meta name="viewport" content="initial-scale=1.0, user-scalable=no" />
     <meta http-equiv="content-type" content="text/html; charset=UTF-8"/>
     <link rel="shortcut icon" href="http://cartodb.com/assets/favicon.ico" />
-    <link rel="stylesheet" href="../../dist/themes/css/cartodb.css" />
+    <link rel="stylesheet" href="../../dist/internal/themes/css/cartodb.css" />
     <style>
       html, body, #map {
         height: 100%;
@@ -20,7 +20,7 @@
     <!-- include tangram library -->
     <script src="https://mapzen.com/tangram/tangram.min.js"></script>
     <!-- include cartodb.js library -->
-    <script src="../../dist/cartodb.uncompressed.js"></script>
+    <script src="../../dist/internal/cartodb.uncompressed.js"></script>
 
 
     <script>

diff --git a/examples/basemap-selector.html b/examples/basemap-selector.html
@@ -5,7 +5,7 @@
     <meta name="viewport" content="initial-scale=1.0, user-scalable=no" />
     <meta http-equiv="content-type" content="text/html; charset=UTF-8"/>
     <link rel="shortcut icon" href="http://cartodb.com/assets/favicon.ico" />
-    <link rel="stylesheet" href="../../dist/themes/css/cartodb.css" />
+    <link rel="stylesheet" href="../../dist/internal/themes/css/cartodb.css" />
     <style>
       html {
         font-family: 'Open Sans';
@@ -60,7 +60,7 @@ <h2>Google Maps</h2>
     <script src="https://mapzen.com/tangram/tangram.min.js"></script>
 
     <!-- include cartodb.js library -->
-    <script src="../../dist/cartodb.uncompressed.js"></script>
+    <script src="../../dist/internal/cartodb.uncompressed.js"></script>
 
     <script>
       var BASEMAPS = {

diff --git a/examples/gmaps-geometry-editor.html b/examples/gmaps-geometry-editor.html
@@ -5,7 +5,7 @@
     <meta name="viewport" content="initial-scale=1.0, user-scalable=no" />
     <meta http-equiv="content-type" content="text/html; charset=UTF-8"/>
     <link rel="shortcut icon" href="http://cartodb.com/assets/favicon.ico" />
-    <link rel="stylesheet" href="../../dist/themes/css/cartodb.css" />
+    <link rel="stylesheet" href="../../dist/internal/themes/css/cartodb.css" />
     <style>
       html, body {
         height: 100%;
@@ -116,7 +116,7 @@ <h1>Geometry Editor</h1>
     <script src="https://mapzen.com/tangram/tangram.min.js"></script>
 
     <!-- include cartodb.js library -->
-    <script src="../../dist/cartodb.uncompressed.js"></script>
+    <script src="../../dist/internal/cartodb.uncompressed.js"></script>
 
     <script>
       var vizjson = {

diff --git a/examples/gmaps-layergroup.html b/examples/gmaps-layergroup.html
@@ -13,7 +13,7 @@
       }
     </style>
 
-    <link rel="stylesheet" href="../../dist/themes/css/cartodb.css" />
+    <link rel="stylesheet" href="../../dist/internal/themes/css/cartodb.css" />
   </head>
   <body>
     <div id="map"></div>
@@ -25,7 +25,7 @@
     <script src="https://mapzen.com/tangram/tangram.min.js"></script>
 
     <!-- include cartodb.js library -->
-    <script src="../../dist/cartodb.uncompressed.js"></script>
+    <script src="../../dist/internal/cartodb.uncompressed.js"></script>
 
     <script>
       function main() {

diff --git a/examples/gmaps-namedmap.html b/examples/gmaps-namedmap.html
@@ -13,7 +13,7 @@
       }
     </style>
 
-    <link rel="stylesheet" href="../../dist/themes/css/cartodb.css" />
+    <link rel="stylesheet" href="../../dist/internal/themes/css/cartodb.css" />
   </head>
   <body>
     <div id="map"></div>
@@ -25,7 +25,7 @@
     <script src="https://mapzen.com/tangram/tangram.min.js"></script>
 
     <!-- include cartodb.js library -->
-    <script src="../../dist/cartodb.uncompressed.js"></script>
+    <script src="../../dist/internal/cartodb.uncompressed.js"></script>
 
     <script>
       function main() {

diff --git a/examples/index.html b/examples/index.html
@@ -9,9 +9,9 @@
     <link href="https://fonts.googleapis.com/css?family=Open+Sans" rel="stylesheet">
     <link rel="shortcut icon" href="http://cartodb.com/assets/favicon.ico" />
     <!--Include carto styles  -->
-    <link rel="stylesheet" href="../../dist/themes/css/cartodb.css" />
+    <link rel="stylesheet" href="../../dist/internal/themes/css/cartodb.css" />
     <!-- Include cartodb.js Library -->
-    <script src="../../dist/cartodb.uncompressed.js"></script>
+    <script src="../../dist/internal/cartodb.uncompressed.js"></script>
     <!-- Include Tangram Library  -->
     <script src="https://mapzen.com/tangram/tangram.min.js"></script>
     <!-- Custom Map styles  -->

diff --git a/examples/leaflet-geometry-editor.html b/examples/leaflet-geometry-editor.html
@@ -5,7 +5,7 @@
     <meta name="viewport" content="initial-scale=1.0, user-scalable=no" />
     <meta http-equiv="content-type" content="text/html; charset=UTF-8"/>
     <link rel="shortcut icon" href="http://cartodb.com/assets/favicon.ico" />
-    <link rel="stylesheet" href="../../dist/themes/css/cartodb.css" />
+    <link rel="stylesheet" href="../../dist/internal/themes/css/cartodb.css" />
     <style>
       html, body {
         height: 100%;
@@ -113,7 +113,7 @@ <h1>Geometry Editor</h1>
     <script src="https://mapzen.com/tangram/tangram.min.js"></script>
 
     <!-- include cartodb.js library -->
-    <script src="../../dist/cartodb.uncompressed.js"></script>
+    <script src="../../dist/internal/cartodb.uncompressed.js"></script>
 
     <script>
       var vizjson = {

diff --git a/examples/leaflet-layergroup-legends.html b/examples/leaflet-layergroup-legends.html
@@ -5,7 +5,7 @@
     <meta name="viewport" content="initial-scale=1.0, user-scalable=no" />
     <meta http-equiv="content-type" content="text/html; charset=UTF-8"/>
     <link rel="shortcut icon" href="http://cartodb.com/assets/favicon.ico" />
-    <link rel="stylesheet" href="../../dist/themes/css/cartodb.css" />
+    <link rel="stylesheet" href="../../dist/internal/themes/css/cartodb.css" />
     <script src="https://ajax.googleapis.com/ajax/libs/jquery/2.2.4/jquery.min.js"></script>
     <style>
       html, body, #map {
@@ -22,7 +22,7 @@
     <script src="https://mapzen.com/tangram/tangram.min.js"></script>
 
     <!-- include cartodb.js library -->
-    <script src="../../dist/cartodb.uncompressed.js"></script>
+    <script src="../../dist/internal/cartodb.uncompressed.js"></script>
 
     <script>
       function main() {

diff --git a/examples/leaflet-layergroup-vector.html b/examples/leaflet-layergroup-vector.html
@@ -5,7 +5,7 @@
     <meta name="viewport" content="initial-scale=1.0, user-scalable=no" />
     <meta http-equiv="content-type" content="text/html; charset=UTF-8"/>
     <link rel="shortcut icon" href="http://cartodb.com/assets/favicon.ico" />
-    <link rel="stylesheet" href="../../dist/themes/css/cartodb.css" />
+    <link rel="stylesheet" href="../../dist/internal/themes/css/cartodb.css" />
     <style>
       html, body, #map {
         height: 100%;
@@ -21,7 +21,7 @@
     <script src="https://mapzen.com/tangram/tangram.min.js"></script>
 
     <!-- include cartodb.js library -->
-    <script src="../../dist/cartodb.uncompressed.js"></script>
+    <script src="../../dist/internal/cartodb.uncompressed.js"></script>
 
     <script>
       function main() {

diff --git a/examples/leaflet-layergroup.html b/examples/leaflet-layergroup.html
@@ -5,7 +5,7 @@
     <meta name="viewport" content="initial-scale=1.0, user-scalable=no" />
     <meta http-equiv="content-type" content="text/html; charset=UTF-8"/>
     <link rel="shortcut icon" href="http://cartodb.com/assets/favicon.ico" />
-    <link rel="stylesheet" href="../../dist/themes/css/cartodb.css" />
+    <link rel="stylesheet" href="../../dist/internal/themes/css/cartodb.css" />
     <style>
       html, body, #map {
         height: 100%;
@@ -21,7 +21,7 @@
     <script src="https://mapzen.com/tangram/tangram.min.js"></script>
 
     <!-- include cartodb.js library -->
-    <script src="../../dist/cartodb.uncompressed.js"></script>
+    <script src="../../dist/internal/cartodb.uncompressed.js"></script>
 
     <script>
       function main() {

diff --git a/examples/leaflet-namedmap.html b/examples/leaflet-namedmap.html
@@ -13,7 +13,7 @@
       }
     </style>
 
-    <link rel="stylesheet" href="../../dist/themes/css/cartodb.css" />
+    <link rel="stylesheet" href="../../dist/internal/themes/css/cartodb.css" />
   </head>
   <body>
     <div id="map"></div>
@@ -22,7 +22,7 @@
     <script src="https://mapzen.com/tangram/tangram.min.js"></script>
 
     <!-- include cartodb.js library -->
-    <script src="../../dist/cartodb.uncompressed.js"></script>
+    <script src="../../dist/internal/cartodb.uncompressed.js"></script>
 
     <script>
       function main() {

diff --git a/examples/v4/basic.html b/examples/v4/basic.html
@@ -8,10 +8,9 @@
   <title>Basic Carto.js example</title>
   <link rel="stylesheet" href="https://unpkg.com/leaflet@1.2.0/dist/leaflet.css" />
   <script src="https://unpkg.com/leaflet@1.2.0/dist/leaflet.js"></script>
-  <!--Include carto styles  -->
-  <!-- <link rel="stylesheet" href="../../dist/themes/css/cartodb.css" /> -->
+
   <!-- Include cartodb.js Library -->
-  <script src="../../dist/cartodb.uncompressed.js"></script>
+  <script src="../../dist/internal/cartodb.uncompressed.js"></script>
   <link rel="stylesheet" href="./_style.css">
   <style></style>
 </head>

diff --git a/examples/v4/bounding-box-filter.html b/examples/v4/bounding-box-filter.html
@@ -10,10 +10,9 @@
   <script src="https://unpkg.com/leaflet@1.2.0/dist/leaflet.js"></script>
   <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/leaflet.draw/0.4.12/leaflet.draw-src.css" />
   <script src="https://cdnjs.cloudflare.com/ajax/libs/leaflet.draw/0.4.12/leaflet.draw-src.js"></script>
-  <!--Include carto styles  -->
-  <link rel="stylesheet" href="../../dist/themes/css/cartodb.css" />
+
   <!-- Include cartodb.js Library -->
-  <script src="../../dist/cartodb.uncompressed.js"></script>
+  <script src="../../dist/internal/cartodb.uncompressed.js"></script>
   <link rel="stylesheet" href="./_style.css">
   <style>
     #widgetC {

diff --git a/examples/v4/bounding-box-leaflet-filter.html b/examples/v4/bounding-box-leaflet-filter.html
@@ -8,10 +8,9 @@
   <title>Bounding box filter dataview example</title>
   <link rel="stylesheet" href="https://unpkg.com/leaflet@1.2.0/dist/leaflet.css" />
   <script src="https://unpkg.com/leaflet@1.2.0/dist/leaflet.js"></script>
-  <!--Include carto styles  -->
-  <link rel="stylesheet" href="../../dist/themes/css/cartodb.css" />
+
   <!-- Include cartodb.js Library -->
-  <script src="../../dist/cartodb.uncompressed.js"></script>
+  <script src="../../dist/internal/cartodb.uncompressed.js"></script>
   <style>
     #map {
       position: absolute;

diff --git a/examples/v4/category-dataview.html b/examples/v4/category-dataview.html
@@ -8,10 +8,9 @@
   <title>Category dataview example</title>
   <link rel="stylesheet" href="https://unpkg.com/leaflet@1.2.0/dist/leaflet.css" />
   <script src="https://unpkg.com/leaflet@1.2.0/dist/leaflet.js"></script>
-  <!--Include carto styles  -->
-  <link rel="stylesheet" href="../../dist/themes/css/cartodb.css" />
+
   <!-- Include cartodb.js Library -->
-  <script src="../../dist/cartodb.uncompressed.js"></script>
+  <script src="../../dist/internal/cartodb.uncompressed.js"></script>
   <link rel="stylesheet" href="./_style.css">
   <style>
     #widget {

diff --git a/examples/v4/errors.html b/examples/v4/errors.html
@@ -8,10 +8,9 @@
     <title>Basic Carto.js example</title>
     <link rel="stylesheet" href="https://unpkg.com/leaflet@1.2.0/dist/leaflet.css" />
     <script src="https://unpkg.com/leaflet@1.2.0/dist/leaflet.js"></script>
-    <!--Include carto styles  -->
-    <!-- <link rel="stylesheet" href="../../dist/themes/css/cartodb.css" /> -->
+
     <!-- Include cartodb.js Library -->
-    <script src="../../dist/cartodb.uncompressed.js"></script>
+    <script src="../../dist/internal/cartodb.uncompressed.js"></script>
     <!-- common styles for the examples -->
     <link rel="stylesheet" href="./_style.css">
     <!-- Syntax highlighting library -->

diff --git a/examples/v4/formula-dataview.html b/examples/v4/formula-dataview.html
@@ -8,10 +8,9 @@
   <title>Formula dataview example</title>
   <link rel="stylesheet" href="https://unpkg.com/leaflet@1.2.0/dist/leaflet.css" />
   <script src="https://unpkg.com/leaflet@1.2.0/dist/leaflet.js"></script>
-  <!--Include carto styles  -->
-  <link rel="stylesheet" href="../../dist/themes/css/cartodb.css" />
+
   <!-- Include cartodb.js Library -->
-  <script src="../../dist/cartodb.uncompressed.js"></script>
+  <script src="../../dist/internal/cartodb.uncompressed.js"></script>
   <link rel="stylesheet" href="./_style.css">
   <style>
     #widget {

diff --git a/examples/v4/histogram-dataview.html b/examples/v4/histogram-dataview.html
@@ -8,10 +8,9 @@
   <title>Basic Carto.js example</title>
   <link rel="stylesheet" href="https://unpkg.com/leaflet@1.2.0/dist/leaflet.css" />
   <script src="https://unpkg.com/leaflet@1.2.0/dist/leaflet.js"></script>
-  <!--Include carto styles  -->
-  <link rel="stylesheet" href="../../dist/themes/css/cartodb.css" />
+
   <!-- Include cartodb.js Library -->
-  <script src="../../dist/cartodb.uncompressed.js"></script>
+  <script src="../../dist/internal/cartodb.uncompressed.js"></script>
   <style>
   #map {
       position: absolute;

diff --git a/examples/v4/interactivity.html b/examples/v4/interactivity.html
@@ -8,10 +8,9 @@
   <title>Basic Carto.js example</title>
   <link rel="stylesheet" href="https://unpkg.com/leaflet@1.2.0/dist/leaflet.css" />
   <script src="https://unpkg.com/leaflet@1.2.0/dist/leaflet.js"></script>
-  <!--Include carto styles  -->
-  <!-- <link rel="stylesheet" href="../../dist/themes/css/cartodb.css" /> -->
+
   <!-- Include cartodb.js Library -->
-  <script src="../../dist/cartodb.uncompressed.js"></script>
+  <script src="../../dist/internal/cartodb.uncompressed.js"></script>
   <link rel="stylesheet" href="./_style.css">
 </head>
 

diff --git a/grunt/tasks/_browserify-bundles.js b/grunt/tasks/_browserify-bundles.js
@@ -23,6 +23,6 @@ module.exports = {
 
   cartodb: {
     src: 'src/cartodb.js',
-    dest: '<%= config.dist %>/cartodb.uncompressed.js'
+    dest: '<%= config.dist %>/internal/cartodb.uncompressed.js'
   }
 };
diff --git a/grunt/tasks/concat.js b/grunt/tasks/concat.js
@@ -5,7 +5,7 @@ module.exports = {
         options: {},
         files: {
           // CartoDB.js CSSs (themes?)
-          '<%= config.dist %>/themes/css/cartodb.css': [
+          '<%= config.dist %>/internal/themes/css/cartodb.css': [
             '.tmp/scss/**/*.css'
           ]
         }

diff --git a/grunt/tasks/copy.js b/grunt/tasks/copy.js
@@ -5,7 +5,7 @@ module.exports = {
         expand: true,
         cwd: 'node_modules/cartoassets/src/fonts/',
         src: [ '**/*.{eot,ttf,woff,svg}' ],
-        dest: '<%= config.dist %>/themes/fonts'
+        dest: '<%= config.dist %>/internal/themes/fonts'
       }
     };
   }

diff --git a/grunt/tasks/cssmin.js b/grunt/tasks/cssmin.js
@@ -19,7 +19,7 @@ module.exports = {
           check: 'gzip'
         },
         files: {
-          '<%= config.dist %>/themes/css/cartodb.css': ['<%= config.dist %>/themes/css/cartodb.css']
+          '<%= config.dist %>/internal/themes/css/cartodb.css': ['<%= config.dist %>/internal/themes/css/cartodb.css']
         }
       }
 

diff --git a/grunt/tasks/imagemin.js b/grunt/tasks/imagemin.js
@@ -13,7 +13,7 @@ module.exports = {
           expand: true,
           cwd: 'themes/img',
           src: [ '**/*.{png,jpg,gif,svg}' ],
-          dest: '<%= config.dist %>/themes/img'
+          dest: '<%= config.dist %>/internal/themes/img'
         }]
       }
     }

diff --git a/grunt/tasks/watch.js b/grunt/tasks/watch.js
@@ -19,7 +19,7 @@ module.exports = {
         },
         files: [
           '.tmp/css/**/*.css',
-          '<%= config.dist %>/themes/css/cartodb.css'
+          '<%= config.dist %>/internal/themes/css/cartodb.css'
         ]
       }
     };

diff --git a/index.html b/index.html
@@ -4,20 +4,21 @@
   <meta charset="UTF-8" />
   <title>CARTO.js dev server</title>
   <link href="http://fonts.googleapis.com/css?family=Lato:300,400,700" rel="stylesheet" type="text/css">
-  <link href="/dist/themes/css/cartodb.css" rel="stylesheet" type="text/css">
   <link href="/themes/styleguide/styleguide.css" rel="stylesheet" type="text/css">
   <style type="text/css">
     html, body {
       margin: 20px;
+      font-family: sans-serif;
     }
     ul {
       margin-left: 12px;
       list-style-type: circle;
       list-style-position: inside;
     }
-    li {
-      }
-
+    a {
+      color: #1181FB;
+      text-decoration: none;
+    }
     h1,h2,h3 {
       margin-top: 20px;
     }

diff --git a/styleguide/infowindows.html b/styleguide/infowindows.html
@@ -4,8 +4,8 @@
     <meta charset="UTF-8" />
     <title>CartoDB.js styleguide</title>
     <link href='styleguide.css' rel='stylesheet' type='text/css'>
-    <link href='/dist/themes/css/cartodb.css' rel='stylesheet' type='text/css'>
-    <link href='/dist/themes/css/deep-insights.css' rel='stylesheet' type='text/css'>
+    <link href='/dist/internal/themes/css/cartodb.css' rel='stylesheet' type='text/css'>
+    <link href='/dist/internal/themes/css/deep-insights.css' rel='stylesheet' type='text/css'>
     <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.3/jquery.min.js"></script>
     <script src="https://cdn.rawgit.com/andrusieczko/clip-path-polygon/master/build/clip-path-polygon.min.js"></script>
   </head>

diff --git a/styleguide/tooltips.html b/styleguide/tooltips.html
@@ -4,8 +4,8 @@
     <meta charset="UTF-8" />
     <title>CartoDB.js styleguide</title>
     <link href='styleguide.css' rel='stylesheet' type='text/css'>
-    <link href='/dist/themes/css/cartodb.css' rel='stylesheet' type='text/css'>
-    <link href='/dist/themes/css/deep-insights.css' rel='stylesheet' type='text/css'>
+    <link href='/dist/internal/themes/css/cartodb.css' rel='stylesheet' type='text/css'>
+    <link href='/dist/internal/themes/css/deep-insights.css' rel='stylesheet' type='text/css'>
     <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.3/jquery.min.js"></script>
     <script src="https://cdn.rawgit.com/andrusieczko/clip-path-polygon/master/build/clip-path-polygon.min.js"></script>
   </head>