Skip to content

Commit 33fb764

Browse files
javisantanajavisantana
committed
Merge branch 'release/3.9.03'
2 parents 8e9a031 + ccdc615 commit 33fb764

16 files changed

+136
-25
lines changed

‎.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,5 @@ node_modules
44
themes/css/all.css
55
themes/css/cartodb.ie.css
66
secrets.json
7-
v3/*
7+
v3/*
8+
test/*.xml

‎NEWS

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
1-
3.9.02 (14//05//2014)
1+
3.9.03 (14//05//2014)
22
- Added tooltip option in createLayer method
33

4+
3.9.02 (14//05//2014)
5+
- Fixes torque width for small screens
6+
47
3.9.01 (14//05//2014)
58
- Fixed regression for mouseover event in layers
69

‎dist/cartodb.core.js

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/cartodb.core.uncompressed.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
// version: 3.9.02
2-
// sha: 8be1c54f17f5d28b3c14b663de13e1ba6e1fda34
1+
// version: 3.9.03
2+
// sha: dfbb8f4204e231cd83fc53f18e0a00e25ff99a53
33
;(function() {
44
this.cartodb = {};
55
var Backbone = {};
@@ -1141,7 +1141,7 @@ var Mustache;
11411141

11421142
var cdb = root.cdb = {};
11431143

1144-
cdb.VERSION = '3.9.02';
1144+
cdb.VERSION = '3.9.03';
11451145
cdb.DEBUG = false;
11461146

11471147
cdb.CARTOCSS_VERSIONS = {

‎dist/cartodb.css

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -994,6 +994,20 @@ div.cartodb-share a:active, div.cartodb-share a:hover:active {
994994
border-radius: 3px;
995995
}
996996

997+
998+
/* iPhone landscape */
999+
@media only screen
1000+
and (min-device-width : 320px)
1001+
and (max-device-width : 480px)
1002+
and (orientation : landscape) {
1003+
1004+
}
1005+
1006+
@media only screen and (min-width: 360px) and (max-width: 490px) {
1007+
1008+
1009+
}
1010+
9971011
/* iPhone portrait */
9981012
@media only screen
9991013
and (min-device-width : 320px)
@@ -2546,6 +2560,25 @@ and (orientation : landscape) {
25462560
.cartodb-text {display:none}
25472561
.cartodb-map-wrapper { bottom: 0!Important;}
25482562

2563+
.torque div.cartodb-timeslider .slider-wrapper {
2564+
width:98px!important;
2565+
}
2566+
2567+
.torque div.cartodb-timeslider .slider {
2568+
width:98px!important;
2569+
}
2570+
}
2571+
2572+
@media only screen and (min-width: 360px) and (max-width: 490px) {
2573+
2574+
div.cartodb-timeslider .slider-wrapper {
2575+
width:198px!important;
2576+
}
2577+
2578+
div.cartodb-timeslider .slider {
2579+
width:198px!important;
2580+
}
2581+
25492582
}
25502583

25512584
/* iPhone 5 portrait */

‎dist/cartodb.full.uncompressed.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
// cartodb.js version: 3.9.02
1+
// cartodb.js version: 3.9.03
22
// uncompressed version: cartodb.uncompressed.js
3-
// sha: 8be1c54f17f5d28b3c14b663de13e1ba6e1fda34
3+
// sha: dfbb8f4204e231cd83fc53f18e0a00e25ff99a53
44
(function() {
55
var root = this;
66

@@ -20686,7 +20686,7 @@ this.LZMA = LZMA;
2068620686

2068720687
var cdb = root.cdb = {};
2068820688

20689-
cdb.VERSION = '3.9.02';
20689+
cdb.VERSION = '3.9.03';
2069020690
cdb.DEBUG = false;
2069120691

2069220692
cdb.CARTOCSS_VERSIONS = {

‎dist/cartodb.js

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/cartodb.nojquery.js

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/cartodb.noleaflet.js

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/cartodb.uncompressed.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
// cartodb.js version: 3.9.02
1+
// cartodb.js version: 3.9.03
22
// uncompressed version: cartodb.uncompressed.js
3-
// sha: 8be1c54f17f5d28b3c14b663de13e1ba6e1fda34
3+
// sha: dfbb8f4204e231cd83fc53f18e0a00e25ff99a53
44
(function() {
55
var root = this;
66

@@ -20686,7 +20686,7 @@ this.LZMA = LZMA;
2068620686

2068720687
var cdb = root.cdb = {};
2068820688

20689-
cdb.VERSION = '3.9.02';
20689+
cdb.VERSION = '3.9.03';
2069020690
cdb.DEBUG = false;
2069120691

2069220692
cdb.CARTOCSS_VERSIONS = {

‎examples/TheHobbitLocations/css/style.css

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -201,6 +201,14 @@ div.cartodb-popup div.cartodb-popup-tip-container::after {
201201
z-index: 1;
202202
}
203203

204+
div.cartodb-tooltip {
205+
min-width:auto;
206+
max-width:auto;
207+
width:180px;
208+
margin-top:-35px;
209+
margin-left:-90px;
210+
}
211+
204212
div.cartodb-infobox {
205213
bottom:35px!important;
206214
font-family: "Helvetica",Arial;

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "cartodb.js",
3-
"version": "3.9.02",
3+
"version": "3.9.03",
44
"description": "CartoDB javascript library",
55
"repository": {
66
"type": "git",

‎src/cartodb.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
var cdb = root.cdb = {};
77

8-
cdb.VERSION = '3.9.02';
8+
cdb.VERSION = '3.9.03';
99
cdb.DEBUG = false;
1010

1111
cdb.CARTOCSS_VERSIONS = {

‎themes/css/cartodb.css

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -994,6 +994,20 @@ div.cartodb-share a:active, div.cartodb-share a:hover:active {
994994
border-radius: 3px;
995995
}
996996

997+
998+
/* iPhone landscape */
999+
@media only screen
1000+
and (min-device-width : 320px)
1001+
and (max-device-width : 480px)
1002+
and (orientation : landscape) {
1003+
1004+
}
1005+
1006+
@media only screen and (min-width: 360px) and (max-width: 490px) {
1007+
1008+
1009+
}
1010+
9971011
/* iPhone portrait */
9981012
@media only screen
9991013
and (min-device-width : 320px)
@@ -2546,6 +2560,25 @@ and (orientation : landscape) {
25462560
.cartodb-text {display:none}
25472561
.cartodb-map-wrapper { bottom: 0!Important;}
25482562

2563+
.torque div.cartodb-timeslider .slider-wrapper {
2564+
width:98px!important;
2565+
}
2566+
2567+
.torque div.cartodb-timeslider .slider {
2568+
width:98px!important;
2569+
}
2570+
}
2571+
2572+
@media only screen and (min-width: 360px) and (max-width: 490px) {
2573+
2574+
div.cartodb-timeslider .slider-wrapper {
2575+
width:198px!important;
2576+
}
2577+
2578+
div.cartodb-timeslider .slider {
2579+
width:198px!important;
2580+
}
2581+
25492582
}
25502583

25512584
/* iPhone 5 portrait */

‎themes/css/map/cartodb-map-light.css

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -306,6 +306,20 @@ div.cartodb-share a:active, div.cartodb-share a:hover:active {
306306
border-radius: 3px;
307307
}
308308

309+
310+
/* iPhone landscape */
311+
@media only screen
312+
and (min-device-width : 320px)
313+
and (max-device-width : 480px)
314+
and (orientation : landscape) {
315+
316+
}
317+
318+
@media only screen and (min-width: 360px) and (max-width: 490px) {
319+
320+
321+
}
322+
309323
/* iPhone portrait */
310324
@media only screen
311325
and (min-device-width : 320px)

‎themes/css/map/cartodb-slider.css

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,25 @@ and (orientation : landscape) {
6464
.cartodb-text {display:none}
6565
.cartodb-map-wrapper { bottom: 0!Important;}
6666

67+
.torque div.cartodb-timeslider .slider-wrapper {
68+
width:98px!important;
69+
}
70+
71+
.torque div.cartodb-timeslider .slider {
72+
width:98px!important;
73+
}
74+
}
75+
76+
@media only screen and (min-width: 360px) and (max-width: 490px) {
77+
78+
div.cartodb-timeslider .slider-wrapper {
79+
width:198px!important;
80+
}
81+
82+
div.cartodb-timeslider .slider {
83+
width:198px!important;
84+
}
85+
6786
}
6887

6988
/* iPhone 5 portrait */

0 commit comments

Comments
 (0)