Skip to content

Commit 68adde6

Browse files
simeonoffsimeonoff
authored
Merge branch 'vnext' into sivanova/badge-dot
2 parents c8da17d + 3fc66da commit 68adde6

File tree

734 files changed

+4551
-2135
lines changed

Some content is hidden

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

734 files changed

+4551
-2135
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,3 +51,4 @@
5151
npm-debug.log*
5252
yarn-debug.log*
5353
yarn-error.log*
54+
*.db

‎browser/public/index.html‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,12 @@
1111
</title>
1212
<base href="/webcomponents-demos/">
1313

14-
<link href="https://fonts.googleapis.com/css?family=Kanit&display=swap" rel="stylesheet">
15-
<link href="https://dl.infragistics.com/x/img/browsers/wc.png" rel="shortcut icon" >
16-
<link href="https://dl.infragistics.com/x/css/samples/shared.v8.css" rel="stylesheet" type="text/css" />
17-
<link href="https://dl.infragistics.com/x/css/samples/custom-legend.css" rel="stylesheet" type="text/css" />
14+
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Berkshire+Swash">
15+
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Kanit&display=swap" >
16+
<link rel="stylesheet" href="https://fonts.googleapis.com/icon?family=Material+Icons" />
17+
<link rel="stylesheet" href="https://dl.infragistics.com/x/css/samples/shared.v8.css" type="text/css" />
18+
<link rel="stylesheet" href="https://dl.infragistics.com/x/css/samples/custom-legend.css" type="text/css" />
19+
<link rel="shortcut icon" href="https://dl.infragistics.com/x/img/browsers/wc.png" >
1820

1921
<!-- <link href="<%= htmlWebpackPlugin.options.publicPath %>assets/css/index.css" rel="stylesheet" /> -->
2022
<link href="<%= htmlWebpackPlugin.options.publicPath %>assets/css/browser.css" rel="stylesheet" />
@@ -1133,6 +1135,7 @@
11331135
<a class="nav-link" href="#" data-nav="/samples/maps/geo-map/marker-type">─<span>Geo Map Marker Type</span></a>
11341136
<a class="nav-link" href="#" data-nav="/samples/maps/geo-map/navigation">─<span>Geo Map Navigation</span></a>
11351137
<a class="nav-link" href="#" data-nav="/samples/maps/geo-map/overview">─<span>Geo Map Overview</span></a>
1138+
<a class="nav-link" href="#" data-nav="/samples/maps/geo-map/santa-flights-map">─<span>Geo Map Santa Flights Map</span></a>
11361139
<a class="nav-link" href="#" data-nav="/samples/maps/geo-map/shape-styling">─<span>Geo Map Shape Styling</span></a>
11371140
<a class="nav-link" href="#" data-nav="/samples/maps/geo-map/synchronization">─<span>Geo Map Synchronization</span></a>
11381141
<a class="nav-link" href="#" data-nav="/samples/maps/geo-map/triangulating-data">─<span>Geo Map Triangulating Data</span></a>

‎browser/src/assets/holidays/santa-claus.png‎

38.3 KB
Loading

‎browser/src/templates/index.html‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,12 @@
1111
</title>
1212
<base href="/webcomponents-demos/">
1313

14-
<link href="https://fonts.googleapis.com/css?family=Kanit&display=swap" rel="stylesheet">
15-
<link href="https://dl.infragistics.com/x/img/browsers/wc.png" rel="shortcut icon" >
16-
<link href="https://dl.infragistics.com/x/css/samples/shared.v8.css" rel="stylesheet" type="text/css" />
17-
<link href="https://dl.infragistics.com/x/css/samples/custom-legend.css" rel="stylesheet" type="text/css" />
14+
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Berkshire+Swash">
15+
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Kanit&display=swap" >
16+
<link rel="stylesheet" href="https://fonts.googleapis.com/icon?family=Material+Icons" />
17+
<link rel="stylesheet" href="https://dl.infragistics.com/x/css/samples/shared.v8.css" type="text/css" />
18+
<link rel="stylesheet" href="https://dl.infragistics.com/x/css/samples/custom-legend.css" type="text/css" />
19+
<link rel="shortcut icon" href="https://dl.infragistics.com/x/img/browsers/wc.png" >
1820

1921
<!-- <link href="<%= htmlWebpackPlugin.options.publicPath %>assets/css/index.css" rel="stylesheet" /> -->
2022
<link href="<%= htmlWebpackPlugin.options.publicPath %>assets/css/browser.css" rel="stylesheet" />

‎browser/tasks/gulp-samples.js‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -999,18 +999,18 @@ function updateIG(cb) {
999999
// { version: "3.2.12", name: "igniteui-webcomponents-core" }, // PUBLIC NPM
10001000
let packageUpgrades = [
10011001
// these IG packages are often updated:
1002-
{ version: "6.3.1-beta.0", name: "igniteui-webcomponents-core" },
1003-
{ version: "6.3.1-beta.0", name: "igniteui-webcomponents-charts" },
1004-
{ version: "6.3.1-beta.0", name: "igniteui-webcomponents-excel" },
1005-
{ version: "6.3.1-beta.0", name: "igniteui-webcomponents-gauges" },
1006-
{ version: "6.3.1-beta.0", name: "igniteui-webcomponents-data-grids" },
1007-
{ version: "6.3.1-beta.0", name: "igniteui-webcomponents-inputs" },
1008-
{ version: "6.3.1-beta.0", name: "igniteui-webcomponents-layouts" },
1009-
{ version: "6.3.1-beta.0", name: "igniteui-webcomponents-maps" },
1010-
{ version: "6.3.1-beta.0", name: "igniteui-webcomponents-spreadsheet-chart-adapter" },
1011-
{ version: "6.3.1-beta.0", name: "igniteui-webcomponents-spreadsheet" },
1012-
{ version: "6.3.1-beta.0", name: "igniteui-webcomponents-datasources" },
1013-
{ version: "6.3.1-beta.0", name: "igniteui-webcomponents-dashboards" },
1002+
{ version: "6.3.1", name: "igniteui-webcomponents-core" },
1003+
{ version: "6.3.1", name: "igniteui-webcomponents-charts" },
1004+
{ version: "6.3.1", name: "igniteui-webcomponents-excel" },
1005+
{ version: "6.3.1", name: "igniteui-webcomponents-gauges" },
1006+
{ version: "6.3.1", name: "igniteui-webcomponents-data-grids" },
1007+
{ version: "6.3.1", name: "igniteui-webcomponents-inputs" },
1008+
{ version: "6.3.1", name: "igniteui-webcomponents-layouts" },
1009+
{ version: "6.3.1", name: "igniteui-webcomponents-maps" },
1010+
{ version: "6.3.1", name: "igniteui-webcomponents-spreadsheet-chart-adapter" },
1011+
{ version: "6.3.1", name: "igniteui-webcomponents-spreadsheet" },
1012+
{ version: "6.3.1", name: "igniteui-webcomponents-datasources" },
1013+
{ version: "6.3.1", name: "igniteui-webcomponents-dashboards" },
10141014
// these IG packages are sometimes updated:
10151015
{ version: "^0.0.1", name: "igniteui-grid-lite" },
10161016
{ version: "^6.2.2", name: "igniteui-webcomponents-grids" },

0 commit comments

Comments
 (0)