Skip to content

Commit c972968

Browse files
author
Judy Zhu
committed
mege
1 parent 8546d50 commit c972968

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+630
-222
lines changed

‎.travis.yml

+3-6
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,15 @@
11
language: node_js
22
sudo: false
33
node_js:
4-
- "6"
54
- "8"
6-
- "10"
7-
- "11"
85
addons:
96
chrome: stable
107
env:
11-
- NPM_SCRIPT=build
8+
- NPM_SCRIPT=test:browserless
129
matrix:
1310
include:
1411
# Run browser tests only on one Node.js version to save time.
1512
- node_js: "8"
16-
env: NPM_SCRIPT=build
13+
env: NPM_SCRIPT=test:browser
1714
script:
18-
- npm run $NPM_SCRIPT
15+
- true

‎example/html/AQI-radar.html

+6-2
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
<meta charset="UTF-8">
66
<meta name="viewport" content="width=device-width, initial-scale=1.0">
77
<meta http-equiv="X-UA-Compatible" content="ie=edge">
8-
<title>AQI Radar </title>
8+
<title> AQI Radar </title>
99
<!-- style sheet for vectormap.js -->
1010
<link rel="stylesheet" href="https://cdn.thinkgeo.com/vectormap-js/1.0.2/vectormap.css">
11-
<style>
11+
<style rel="stylesheet" type="text/css">
1212
.map {
1313
position: relative;
1414
}
@@ -43,6 +43,10 @@
4343

4444
<body>
4545
<div id="map" style="width:100%;height:100%">
46+
<<<<<<< HEAD
47+
=======
48+
<div class="map_label">Atmospheric Analysis in Some States of the United States</div>
49+
>>>>>>> e83c2f1eaf3f024627e9f1ba336bb2763c1ea46d
4650
<ul class="aqiChart">
4751
<li><i style="background-color: #38A700"></i> Atlanta</li>
4852
<li><i style="background-color: #FA00FA"></i> Chincago</li>

‎example/html/GML.html

+1-2
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,9 @@
55
<meta charset="UTF-8">
66
<meta name="viewport" content="width=device-width, initial-scale=1.0">
77
<meta http-equiv="X-UA-Compatible" content="ie=edge">
8-
<title>GML</title>
8+
<title> GML </title>
99
<!-- style sheet for vectormap.js -->
1010
<link rel="stylesheet" href="https://cdn.thinkgeo.com/vectormap-js/1.0.2/vectormap.css">
11-
</link>
1211
</head>
1312

1413
<body>

‎example/html/GPX.html

-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
<title>GPX</title>
99
<!-- style sheet for vectormap.js -->
1010
<link rel="stylesheet" href="https://cdn.thinkgeo.com/vectormap-js/1.0.2/vectormap.css">
11-
</link>
1211
</head>
1312

1413
<body>

‎example/html/KML.html

+1-2
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,9 @@
55
<meta charset="UTF-8">
66
<meta name="viewport" content="width=device-width, initial-scale=1.0">
77
<meta http-equiv="X-UA-Compatible" content="ie=edge">
8-
<title>KML</title>
8+
<title> KML </title>
99
<!-- style sheet for vectormap.js -->
1010
<link rel="stylesheet" href="https://cdn.thinkgeo.com/vectormap-js/1.0.2/vectormap.css">
11-
</link>
1211
</head>
1312

1413
<body>

‎example/html/WFS.html

+1-2
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,9 @@
55
<meta charset="UTF-8">
66
<meta name="viewport" content="width=device-width, initial-scale=1.0">
77
<meta http-equiv="X-UA-Compatible" content="ie=edge">
8-
<title>WFS</title>
8+
<title> WFS </title>
99
<!-- style sheet for vectormap.js -->
1010
<link rel="stylesheet" href="https://cdn.thinkgeo.com/vectormap-js/1.0.2/vectormap.css">
11-
</link>
1211
</head>
1312

1413
<body>

‎example/html/WKT.html

+1-2
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,9 @@
55
<meta charset="UTF-8">
66
<meta name="viewport" content="width=device-width, initial-scale=1.0">
77
<meta http-equiv="X-UA-Compatible" content="ie=edge">
8-
<title>WKT</title>
8+
<title> WKT </title>
99
<!-- style sheet for vectormap.js -->
1010
<link rel="stylesheet" href="https://cdn.thinkgeo.com/vectormap-js/1.0.2/vectormap.css">
11-
</link>
1211
</head>
1312

1413
<body>

‎example/html/angular.html

+65-9
Original file line numberDiff line numberDiff line change
@@ -5,33 +5,89 @@
55
<meta charset="UTF-8">
66
<meta name="viewport" content="width=device-width, initial-scale=1.0">
77
<meta http-equiv="X-UA-Compatible" content="ie=edge">
8-
<title>Angular</title>
8+
<title> Angular </title>
99
<base href="/">
1010
<link rel="stylesheet" href="https://cdn.thinkgeo.com/vectormap-js/1.0.2/vectormap.css">
11-
</link>
12-
<style>
11+
<style rel="stylesheet" type="text/css">
1312
#map {
1413
width: 100%;
1514
height: 100%;
1615
background: #fdeeb0;
1716
}
1817

1918
#lines {
19+
z-index: 1;
2020
position: absolute;
2121
right: 0;
2222
top: 0;
2323
background: #fff;
24-
padding: 1rem;
25-
z-index: 1;
24+
padding: 0.6rem!important;
25+
box-shadow: 0 2px 4px rgba(0, 0, 0, .2), 0 -1px 0 rgba(0, 0, 0, .02);
26+
border-bottom-left-radius: 5px;
2627
}
2728

28-
#lines label{
29+
#lines label {
2930
display: inline-block;
30-
width: 85px;
31+
width: 82px;
32+
color: #5f6b78;
33+
text-align: right;
34+
margin: 12px 0;
35+
padding-right: 5px;
36+
}
37+
38+
#lines select {
39+
width: 196px;
40+
}
41+
42+
#lines input,
43+
#lines select {
44+
padding: 3px 12px;
45+
line-height: 1.42857;
46+
color: #555;
47+
background-color: #fff;
48+
background-image: none;
49+
border: 1px solid #ccc;
50+
border-radius: 4px;
51+
-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075);
52+
box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075);
53+
-webkit-transition: border-color ease-in-out .15s, -webkit-box-shadow ease-in-out .15s;
54+
-o-transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;
55+
transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;
56+
}
57+
58+
#lines input:focus,
59+
#lines select:focus {
60+
border-color: #66afe9;
61+
outline: 0;
62+
-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075), 0 0 8px rgba(102, 175, 233, .6);
63+
box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075), 0 0 8px rgba(102, 175, 233, .6);
64+
}
65+
66+
#lines button {
67+
margin-left: calc(50% - 37.5px);
68+
display: inline-block;
69+
padding: 6px 12px;
70+
margin-bottom: 0;
71+
font-size: 14px;
72+
font-weight: normal;
73+
line-height: 1.428571429;
74+
text-align: center;
75+
white-space: nowrap;
76+
vertical-align: middle;
77+
cursor: pointer;
78+
border: 1px solid #357ebd;
79+
border-radius: 4px;
80+
color: #fff;
81+
background-color: #428bca;
82+
}
83+
84+
#lines button:focus {
85+
outline: 0;
3186
}
3287

33-
#lines select{
34-
width: 173px;
88+
#lines button:active {
89+
-webkit-box-shadow: inset 0 5px 4px rgba(0, 0, 0, .075);
90+
box-shadow: inset 0 5px 4px rgba(0, 0, 0, .075);
3591
}
3692
</style>
3793
</head>

‎example/html/cloud-raster-maps.html

+2-3
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,10 @@
55
<meta charset="UTF-8">
66
<meta name="viewport" content="width=device-width, initial-scale=1.0">
77
<meta http-equiv="X-UA-Compatible" content="ie=edge">
8-
<title>Cloud Raster Maps </title>
8+
<title> Cloud Raster Maps </title>
99
<!-- style sheet for vectormap.js -->
1010
<link rel="stylesheet" href="https://cdn.thinkgeo.com/vectormap-js/1.0.2/vectormap.css">
11-
</link>
12-
<style>
11+
<style rel="stylesheet" type="text/css">
1312
#map {
1413
position: relative;
1514
width: 100%;

‎example/html/cloud-vector-maps.html

+2-3
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,10 @@
55
<meta charset="UTF-8">
66
<meta name="viewport" content="width=device-width, initial-scale=1.0">
77
<meta http-equiv="X-UA-Compatible" content="ie=edge">
8-
<title>Cloud Vector Maps </title>
8+
<title> Cloud Vector Maps </title>
99
<!-- style sheet for vectormap.js -->
1010
<link rel="stylesheet" href="https://cdn.thinkgeo.com/vectormap-js/1.0.2/vectormap.css">
11-
</link>
12-
<style>
11+
<style rel="stylesheet" type="text/css">
1312
#map {
1413
position: relative;
1514
width: 100%;

‎example/html/cluster-envelope.html

+2-3
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,10 @@
55
<meta charset="UTF-8">
66
<meta name="viewport" content="width=device-width, initial-scale=1.0">
77
<meta http-equiv="X-UA-Compatible" content="ie=edge">
8-
<title>Cluster Envelope </title>
8+
<title> Cluster Envelope </title>
99
<!-- style sheet for vectormap.js -->
1010
<link rel="stylesheet" href="https://cdn.thinkgeo.com/vectormap-js/1.0.2/vectormap.css">
11-
</link>
12-
<style>
11+
<style rel="stylesheet" type="text/css">
1312
.map {
1413
position: relative;
1514
}

‎example/html/color-creation.html

+76-15
Original file line numberDiff line numberDiff line change
@@ -5,35 +5,96 @@
55
<meta charset="UTF-8">
66
<meta name="viewport" content="width=device-width, initial-scale=1.0">
77
<meta http-equiv="X-UA-Compatible" content="ie=edge">
8-
<title>Color Utilities
9-
</title>
8+
<title>Color Utilities </title>
109
<!-- style sheet for vectormap.js -->
1110
<link rel="stylesheet" href="https://cdn.thinkgeo.com/vectormap-js/1.0.2/vectormap.css">
12-
</link>
13-
<style>
14-
#user-input{
15-
position: absolute;
16-
right: 0;
17-
top:0rem;
18-
z-index: 1000;
19-
background: #fff;
20-
padding: 1rem
21-
}
11+
<style rel="stylesheet" type="text/css">
12+
#user-input {
13+
position: absolute;
14+
right: 0;
15+
top: 0;
16+
z-index: 1000;
17+
background: #fff;
18+
padding: 0.6rem;
19+
box-shadow: 0 2px 4px rgba(0, 0, 0, .2), 0 -1px 0 rgba(0, 0, 0, .02);
20+
border-bottom-left-radius: 5px;
21+
}
22+
23+
#user-input label {
24+
display: inline-block;
25+
color: #5f6b78;
26+
margin: 3px 0;
27+
}
28+
29+
30+
#user-input input,
31+
#user-input select {
32+
padding: 3px 12px;
33+
line-height: 1.42857;
34+
color: #555;
35+
background-color: #fff;
36+
background-image: none;
37+
border: 1px solid #ccc;
38+
border-radius: 4px;
39+
-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075);
40+
box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075);
41+
-webkit-transition: border-color ease-in-out .15s, -webkit-box-shadow ease-in-out .15s;
42+
-o-transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;
43+
transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;
44+
}
45+
46+
#user-input input:focus,
47+
#user-input select:focus {
48+
border-color: #66afe9;
49+
outline: 0;
50+
-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075), 0 0 8px rgba(102, 175, 233, .6);
51+
box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075), 0 0 8px rgba(102, 175, 233, .6);
52+
}
53+
54+
#user-input button {
55+
display: inline-block;
56+
padding: 3px 10px;
57+
margin-bottom: 0;
58+
font-weight: normal;
59+
line-height: 1.428571429;
60+
text-align: center;
61+
white-space: nowrap;
62+
vertical-align: middle;
63+
cursor: pointer;
64+
border: 1px solid #357ebd;
65+
border-radius: 4px;
66+
color: #fff;
67+
background-color: #428bca;
68+
}
69+
70+
#user-input button:focus {
71+
outline: 0;
72+
}
73+
74+
#user-input button:active {
75+
-webkit-box-shadow: inset 0 5px 4px rgba(0, 0, 0, .075);
76+
box-shadow: inset 0 5px 4px rgba(0, 0, 0, .075);
77+
}
78+
79+
#user-input div {
80+
width: 100%;
81+
text-align: center;
82+
}
2283
</style>
2384
</head>
2485

2586
<body>
2687
<div id="user-input">
27-
<label title="category">category:</label>
88+
<label title="category">Category:</label>
2889
<select name="" id="category">
2990
<option value="analogous" selected="selected">Analogous</option>
3091
<option value="complementary">Complementary</option>
3192
<option value="qualitative">Qualitative</option>
3293
<option value="tetrad">Tetrad</option>
3394
<option value="triad">Triad</option>
3495
</select>
35-
<input type="radio" name="radio" value="random" />Random
36-
<input type="radio" name="radio" checked value="specific" />Specific</label><input class="jscolor" id="color"
96+
<input type="radio" name="radio" value="random" /> <label>Random</label>
97+
<input type="radio" name="radio" checked value="specific" /> <label> Specific Color: </label> <input class="jscolor" id="color"
3798
value="ab2567">
3899

39100
<button id="generate">Generate</button>

‎example/html/contour-line.html

+6-3
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,10 @@
55
<meta charset="UTF-8">
66
<meta name="viewport" content="width=device-width, initial-scale=1.0">
77
<meta http-equiv="X-UA-Compatible" content="ie=edge">
8-
<title>Contour Line </title>
8+
<title> Contour Line </title>
99
<!-- style sheet for vectormap.js -->
1010
<link rel="stylesheet" href="https://cdn.thinkgeo.com/vectormap-js/1.0.2/vectormap.css">
11-
</link>
12-
<style>
11+
<style rel="stylesheet" type="text/css">
1312
.map {
1413
position: relative;
1514
}
@@ -65,6 +64,10 @@
6564

6665
<body>
6766
<div id="map" style="width:100%;height:100%">
67+
<<<<<<< HEAD
68+
=======
69+
<div class="map_label">Rainfall Distribution in China at 17:00 on oct 16 , 2018</div>
70+
>>>>>>> e83c2f1eaf3f024627e9f1ba336bb2763c1ea46d
6871
<div class="legend">
6972
<ul class="rainfall ">
7073
<li><i class="lightRain"></i> Light Rain</li>

0 commit comments

Comments
 (0)