Skip to content

Commit b631b3f

Browse files
MyIgelMyIgel
committed
Merge remote-tracking branch 'upstream/develop'
# Conflicts: # .travis.yml # config.js # html/index.html # locale/de.json # locale/en.json # package.json
2 parents 5bd7922 + f590aaa commit b631b3f

25 files changed

Lines changed: 27284 additions & 11877 deletions

‎.sass-lint.yml‎

Lines changed: 0 additions & 2 deletions
This file was deleted.

‎.stylelintrc‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
{
2+
"extends": "stylelint-config-standard",
3+
"rules": {
4+
"at-rule-no-unknown": [true, {
5+
"ignoreAtRules": ["function", "if", "each", "include", "mixin"]
6+
}],
7+
"number-leading-zero": "never",
8+
"no-descending-specificity": null
9+
}
10+
}

‎.travis.yml‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
sudo: false
2+
dist: trusty
3+
4+
language: node_js
5+
6+
node_js:
7+
- "14"
8+
9+
os:
10+
- linux
11+
- osx
12+
13+
matrix:
14+
include:
15+
- node_js: "12"
16+
os: linux
17+
cache:
18+
yarn: true
19+
20+
before_script:
21+
- if git status | grep -q "modified. \.travis\.yml"; then echo "Dirty yarn.lock"; exit 1; fi
22+
23+
script:
24+
- gulp

‎app.js‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
'use strict';
22

33
require.config({
4-
baseUrl: 'lib',
54
paths: {
65
'polyglot': '../node_modules/node-polyglot/build/polyglot',
76
'Navigo': '../node_modules/navigo/lib/navigo',
87
'leaflet': '../node_modules/leaflet/dist/leaflet',
9-
'moment': '../node_modules/moment/moment',
8+
'moment': '../node_modules/moment/min/moment.min',
109
// d3 modules indirect dependencies
1110
// by d3-zoom: d3-drag
1211
'd3-ease': '../node_modules/d3-ease/dist/d3-ease',

‎assets/icons/icon.scss‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,10 @@ $cache-breaker: unique-id();
77
font-family: 'ionicons';
88
font-style: normal;
99
font-weight: normal;
10-
src: url('fonts/meshviewer.woff2?rel=#{$cache-breaker}') format('woff2'),
11-
url('fonts/meshviewer.woff?rel=#{$cache-breaker}') format('woff'),
12-
url('fonts/meshviewer.ttf?rel=#{$cache-breaker}') format('truetype');
10+
src:
11+
url('fonts/meshviewer.woff2?rel=#{$cache-breaker}') format('woff2'),
12+
url('fonts/meshviewer.woff?rel=#{$cache-breaker}') format('woff'),
13+
url('fonts/meshviewer.ttf?rel=#{$cache-breaker}') format('truetype');
1314
}
1415

1516
[class^='ion-'],

‎gulp/tasks/copy.js‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@ module.exports = function (gulp, plugins, config) {
88
.pipe(gulp.dest(config.build));
99
gulp.src(['polyfill.js'])
1010
.pipe(gulp.dest(config.build + '/vendor'));
11-
gulp.src(['node_modules/promise-polyfill/dist/polyfill.js'])
12-
.pipe(gulp.dest(config.build + '/vendor/promise'));
1311
return gulp.src(['assets/fonts/*', 'assets/icons/fonts/*'])
1412
.pipe(gulp.dest(config.build + '/fonts'));
1513
};

‎gulp/tasks/sass.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ module.exports = function (gulp, plugins, config, env) {
22
return function sass() {
33
return gulp.src('scss/*.scss')
44
.pipe(env.development(plugins.sourcemaps.init()))
5-
.pipe(plugins.sass({
5+
.pipe(require('gulp-sass')(require('sass'))({
66
outputStyle: 'compressed',
77
sourceMap: false
88
}))

‎gulp/tasks/sasslint.js‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,12 @@
11
module.exports = function (gulp, plugins, config, env) {
22
return function sasslint() {
33
return gulp.src('scss/**/*.scss')
4-
.pipe(plugins.sassLint())
5-
.pipe(plugins.sassLint.format())
6-
.pipe(env.production(plugins.sassLint.failOnError()));
4+
.pipe(plugins.stylelint({
5+
syntax: 'scss',
6+
failAfterError: env.production(),
7+
reporters: [
8+
{ formatter: 'string', console: true }
9+
]
10+
}));
711
};
812
};

‎html/index.html‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
<!-- contents of html partials will be injected here -->
2525
<!-- endinject -->
2626
<script src="vendor/polyfill.js" inline></script>
27-
<script src="vendor/promise/polyfill.js" inline></script>
2827
<script src="app.js" inline></script>
2928
</head>
3029
<body>

‎lib/map.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ define(['map/clientlayer', 'map/labellayer', 'map/button', 'leaflet', 'map/activ
6363
var layers = config.mapLayers.map(function (d) {
6464
return {
6565
'name': d.name,
66-
'layer': L.tileLayer(d.url.replace('{retina}', L.Browser.retina ? '@2x' : ''), d.config)
66+
'layer': L.tileLayer(d.url.replace('{format}', document.createElement('canvas').toDataURL('image/webp').indexOf('data:image/webp') === 0 ? 'webp' : 'png'), d.config)
6767
};
6868
});
6969

0 commit comments

Comments
 (0)