Compare commits
42 Commits
new-jquery
...
dependabot
| Author | SHA1 | Date | |
|---|---|---|---|
| 6e9cfa638b | |||
| d57f1ac75a | |||
| 99ee61e110 | |||
| 29377d03c4 | |||
| 1de0c61d3a | |||
| bbc4765ea7 | |||
| 2754120e90 | |||
| 0fbe5cb668 | |||
| edfc34341b | |||
| 8c16978c57 | |||
| baa8a98d9f | |||
| 57d62af1ea | |||
| 3b285440a8 | |||
| 9bab70df9a | |||
| c16c48ff2e | |||
| c5333f8739 | |||
| c26703ddb3 | |||
| 8838a46731 | |||
| 40d5ef9b44 | |||
| 969501bfaa | |||
| 0e23b19816 | |||
| dc90a6f512 | |||
| 28a4e4c9d6 | |||
| 2c91ce5c57 | |||
| 7e3741f4eb | |||
| 97c46bc23f | |||
| f20526ae3a | |||
| f9cc87605a | |||
| 5c9392abcd | |||
| 21cecab368 | |||
| 336f7ab4f8 | |||
| c61dc82574 | |||
| 539483ad42 | |||
| c67a812614 | |||
| 5df6e992cb | |||
| 2cf7294ce0 | |||
| 4fbc2a6c39 | |||
| 2123cb9f75 | |||
| c7a42cdc88 | |||
| 533ec3a867 | |||
| 274f7014f7 | |||
| a1b2b894ed |
3
.gitignore
vendored
3
.gitignore
vendored
@ -1,4 +1,3 @@
|
||||
|
||||
node_modules/
|
||||
|
||||
dist/
|
||||
dist/
|
||||
@ -3,4 +3,6 @@ En enkel meritkalkylator
|
||||
|
||||
|
||||
## Link
|
||||
https://meritkollen.se/
|
||||
Release: https://meritkollen.se/
|
||||
|
||||
Development: https://dev.meritkollen.se/
|
||||
|
||||
11
gulpfile.js
11
gulpfile.js
@ -116,7 +116,6 @@ var jsTasks = lazypipe()
|
||||
.pipe(optimizejs)
|
||||
//.pipe(rename, {suffix: '.min'})
|
||||
.pipe(uglify)
|
||||
.pipe(optimizejs)
|
||||
.pipe(header, banner.main, {package: package})
|
||||
.pipe(dest, paths.scripts.output);
|
||||
|
||||
@ -244,13 +243,19 @@ var updateAssetVersion = function (done) {
|
||||
.pipe(dest(paths.output));
|
||||
};
|
||||
// updates version in SW
|
||||
var swTasks = lazypipe()
|
||||
.pipe(optimizejs)
|
||||
.pipe(uglify)
|
||||
.pipe(header, banner.main, {package: package})
|
||||
.pipe(dest, paths.output);
|
||||
|
||||
var buildSW = function (done) {
|
||||
return src('src/sw.js')
|
||||
.pipe(hashsrc({build_dir:paths.output,src_path:"src",hash_len:"6",query_name:"v",exts:[".json",".webp",".jpg",".css",".png",".ico",".js"],
|
||||
regex:/\s*(?:(")([^"]*)|(')([^']*))/ig,
|
||||
analyze: function analyze(match){return {prefix: "'",link:match[4],suffix: ''};}
|
||||
}))
|
||||
.pipe(jsTasks())
|
||||
.pipe(swTasks())
|
||||
.pipe(dest(paths.output));
|
||||
};
|
||||
// Watch for changes to the src directory
|
||||
@ -310,4 +315,4 @@ exports.watch = series(
|
||||
exports.default,
|
||||
//startServer,
|
||||
watchSource
|
||||
);
|
||||
);
|
||||
|
||||
1941
package-lock.json
generated
1941
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@ -24,7 +24,7 @@
|
||||
],
|
||||
"devDependencies": {
|
||||
"autoprefixer": "^9.6.1",
|
||||
"browser-sync": "^2.26.7",
|
||||
"browser-sync": "^2.27.10",
|
||||
"cssnano": "^4.1.10",
|
||||
"del": "^3.0.0",
|
||||
"gulp": "^4.0.2",
|
||||
@ -45,7 +45,8 @@
|
||||
"gulp-usemin": "^0.3.30",
|
||||
"jshint": "^2.9.6",
|
||||
"jshint-stylish": "^2.2.1",
|
||||
"lazypipe": "^1.0.1"
|
||||
"lazypipe": "^1.0.1",
|
||||
"purify-css": "^1.2.5"
|
||||
},
|
||||
"dependencies": {
|
||||
"gulp-hash-src": "^0.1.6"
|
||||
|
||||
@ -11,14 +11,13 @@
|
||||
<meta HTTP-EQUIV="CACHE-CONTROL" CONTENT="public">
|
||||
<link rel="canonical" href="https://meritkollen.se/Kontakt">
|
||||
|
||||
<link rel='preload' async href='/img/background85.webp' as='image' type='image/webp'>
|
||||
<link rel='preconnect' href='https://cdnjs.cloudflare.com' crossorigin>
|
||||
<link rel='preconnect' href='https://pagead2.googlesyndication.com' crossorigin>
|
||||
<script async src="/js/modernizer-webp.js"></script>
|
||||
<link rel="stylesheet" async href="/css/main.css">
|
||||
<link rel='preload' async href='/img/background85.webp' as='image' type='image/webp'>
|
||||
<link disabled class="lateLoader" rel='stylesheet' defer href='https://fonts.googleapis.com/icon?family=Material+Icons'>
|
||||
<link rel="stylesheet" defer href="https://cdnjs.cloudflare.com/ajax/libs/materialize/0.98.2/css/materialize.min.css">
|
||||
<script data-ad-client="ca-pub-5143923140938916" defer src="https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js"></script>
|
||||
|
||||
|
||||
<!--[if lt IE 9]>
|
||||
@ -45,6 +44,7 @@
|
||||
<meta name="theme-color" content="#27233a">
|
||||
|
||||
|
||||
<script data-ad-client="ca-pub-5143923140938916" defer src="https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js"></script>
|
||||
</head>
|
||||
|
||||
<body>
|
||||
|
||||
BIN
src/favicon.ico
Normal file
BIN
src/favicon.ico
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 15 KiB |
|
Before Width: | Height: | Size: 5.9 MiB After Width: | Height: | Size: 5.9 MiB |
Binary file not shown.
|
Before Width: | Height: | Size: 3.7 MiB |
@ -3,12 +3,12 @@
|
||||
"name": "Meritkollen",
|
||||
"icons": [
|
||||
{
|
||||
"src": "android-chrome-192x192.png",
|
||||
"src": "/img/favicon/android-chrome-192x192.png?v=34eb8d",
|
||||
"sizes": "192x192",
|
||||
"type": "image/png"
|
||||
},
|
||||
{
|
||||
"src": "android-chrome-512x512.png",
|
||||
"src": "/img/favicon/android-chrome-512x512.png?v=cfeaa1",
|
||||
"sizes": "512x512",
|
||||
"type": "image/png"
|
||||
}
|
||||
@ -17,4 +17,4 @@
|
||||
"background_color": "#ffffff",
|
||||
"start_url": "https://meritkollen.se",
|
||||
"display": "fullscreen"
|
||||
}
|
||||
}
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 10 KiB |
BIN
src/img/tips.jpg
BIN
src/img/tips.jpg
Binary file not shown.
|
Before Width: | Height: | Size: 32 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 14 KiB |
@ -17,13 +17,12 @@ echo '
|
||||
<meta property="og:description" content="Beräkna ditt gymnasie meritvärde inför univeritet eller högskola">
|
||||
<meta name="title" content="Räkna ut ditt meritvärde">
|
||||
|
||||
<link rel="preload" async href="/img/background85.webp" as="image" type="image/webp">
|
||||
<link rel="preconnect" href="https://cdnjs.cloudflare.com" crossorigin>
|
||||
<link rel="preconnect" href="https://pagead2.googlesyndication.com" crossorigin>
|
||||
<script async src="/js/modernizer-webp.js"></script>
|
||||
<link rel="preload" async href="/img/background85.webp" as="image" type="image/webp">
|
||||
<link disabled class="lateLoader" rel="stylesheet" defer href="https://fonts.googleapis.com/icon?family=Material+Icons">
|
||||
<link rel="stylesheet" defer href="https://cdnjs.cloudflare.com/ajax/libs/materialize/0.98.2/css/materialize.min.css">
|
||||
<script data-ad-client="ca-pub-5143923140938916" defer src="https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js"></script>
|
||||
<link rel="stylesheet" async href="/css/main.css">
|
||||
|
||||
<!--[if lt IE 9]>
|
||||
@ -50,4 +49,5 @@ echo '
|
||||
<meta name="theme-color" content="#27233a">
|
||||
|
||||
|
||||
<script data-ad-client="ca-pub-5143923140938916" defer src="https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js"></script>
|
||||
';
|
||||
|
||||
@ -19,13 +19,12 @@
|
||||
<meta property="og:description" content="Beräkna ditt gymnasie meritvärde inför univeritet eller högskola">
|
||||
<meta name="title" content="Räkna ut ditt meritvärde">
|
||||
|
||||
<link rel="preload" async href="/img/background85.webp" as="image" type="image/webp">
|
||||
<link rel='preconnect' href='https://cdnjs.cloudflare.com' crossorigin>
|
||||
<link rel='preconnect' href='https://pagead2.googlesyndication.com' crossorigin>
|
||||
<script async src="/js/modernizer-webp.js"></script>
|
||||
<link rel="stylesheet" async href="/css/main.css">
|
||||
<link rel="preload" async href="/img/background85.webp" as="image" type="image/webp">
|
||||
<link rel="stylesheet" defer href="https://cdnjs.cloudflare.com/ajax/libs/materialize/0.98.2/css/materialize.min.css">
|
||||
<script data-ad-client="ca-pub-5143923140938916" defer src="https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js"></script>
|
||||
|
||||
|
||||
|
||||
@ -55,6 +54,7 @@
|
||||
|
||||
|
||||
|
||||
<script data-ad-client="ca-pub-5143923140938916" defer src="https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js"></script>
|
||||
</head>
|
||||
<body id="bg">
|
||||
|
||||
@ -97,7 +97,7 @@ XXXX
|
||||
<h2 class="mdl-card__title-text">Meritkollen</h2>
|
||||
</div>
|
||||
<div class="mdl-card__supporting-text">
|
||||
Räkna ut ditt meritvärde inför högskolan eller universitet. Med våran meritkalkylator får du enkelt fram ditt jämförelsetal. Gjord för gymnasieelever med A-F betygsskalan
|
||||
Räkna ut ditt meritvärde inför högskolan eller universitet. Med våran meritkalkylator får du enkelt fram ditt jämförelsetal. Gjord för gymnasieelever med A-F betygsskalan.
|
||||
</div>
|
||||
<div class="mdl-card__title mdl-card--expand">
|
||||
<h2 class="mdl-card__title-text">Om oss</h2>
|
||||
|
||||
2
src/js/jquery.js
vendored
2
src/js/jquery.js
vendored
@ -2827,7 +2827,7 @@ function nodeName( elem, name ) {
|
||||
|
||||
return elem.nodeName && elem.nodeName.toLowerCase() === name.toLowerCase();
|
||||
|
||||
};
|
||||
}
|
||||
var rsingleTag = ( /^<([a-z][^\/\0>:\x20\t\r\n\f]*)[\x20\t\r\n\f]*\/?>(?:<\/\1>|)$/i );
|
||||
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
;(function() {
|
||||
(function() {
|
||||
"use strict";
|
||||
|
||||
/**
|
||||
@ -2220,7 +2220,7 @@ MaterialSnackbar.prototype.cleanup_ = function () {
|
||||
setTimeout(function () {
|
||||
this.element_.setAttribute('aria-hidden', 'true');
|
||||
this.textElement_.textContent = '';
|
||||
if (!Boolean(this.actionElement_.getAttribute('aria-hidden'))) {
|
||||
if (!this.actionElement_.getAttribute('aria-hidden')) {
|
||||
this.setActionHidden_(true);
|
||||
this.actionElement_.textContent = '';
|
||||
this.actionElement_.removeEventListener('click', this.actionHandler_);
|
||||
@ -2881,7 +2881,7 @@ MaterialTextfield.prototype['checkDisabled'] = MaterialTextfield.prototype.check
|
||||
* @public
|
||||
*/
|
||||
MaterialTextfield.prototype.checkFocus = function () {
|
||||
if (Boolean(this.element_.querySelector(':focus'))) {
|
||||
if ((this.element_.querySelector(':focus'))) {
|
||||
this.element_.classList.add(this.CssClasses_.IS_FOCUSED);
|
||||
} else {
|
||||
this.element_.classList.remove(this.CssClasses_.IS_FOCUSED);
|
||||
@ -3120,7 +3120,7 @@ MaterialTooltip.prototype.init = function () {
|
||||
this.forElement_.addEventListener('touchend', this.boundMouseEnterHandler, false);
|
||||
this.forElement_.addEventListener('mouseleave', this.boundMouseLeaveAndScrollHandler, false);
|
||||
window.addEventListener('scroll', this.boundMouseLeaveAndScrollHandler, true);
|
||||
window.addEventListener('touchstart', this.boundMouseLeaveAndScrollHandler);
|
||||
window.addEventListener('touchstart', this.boundMouseLeaveAndScrollHandler, {passive: true});
|
||||
}
|
||||
}
|
||||
};
|
||||
@ -3905,7 +3905,7 @@ MaterialRipple.prototype.init = function () {
|
||||
this.ignoringMouseDown_ = false;
|
||||
this.boundDownHandler = this.downHandler_.bind(this);
|
||||
this.element_.addEventListener('mousedown', this.boundDownHandler);
|
||||
this.element_.addEventListener('touchstart', this.boundDownHandler);
|
||||
this.element_.addEventListener('touchstart', this.boundDownHandler, {passive: true});
|
||||
this.boundUpHandler = this.upHandler_.bind(this);
|
||||
this.element_.addEventListener('mouseup', this.boundUpHandler);
|
||||
this.element_.addEventListener('mouseleave', this.boundUpHandler);
|
||||
|
||||
@ -1,8 +1,6 @@
|
||||
User-agent: *
|
||||
Disallow: /assets/
|
||||
Disallow: /include/
|
||||
Disallow: /404.html
|
||||
Disallow: /50x.html
|
||||
Disallow: /sw.js
|
||||
Disallow: /cache-polyfill.js
|
||||
Disallow: /ads.txt
|
||||
|
||||
@ -1,7 +1,8 @@
|
||||
importScripts('/cache-polyfill.js');
|
||||
importScripts('/js/cache-polyfill.js');
|
||||
|
||||
|
||||
self.addEventListener('install', function(e) {
|
||||
self.skipWaiting();
|
||||
e.waitUntil(
|
||||
caches.open('meritkollen').then(function(cache) {
|
||||
return cache.addAll([
|
||||
@ -18,6 +19,7 @@ self.addEventListener('install', function(e) {
|
||||
'/img/background85.webp',
|
||||
'/img/favicon/manifest.json',
|
||||
'/img/favicon/android-chrome-192x192.png',
|
||||
'/img/favicon/android-chrome-512x512.png',
|
||||
'/img/favicon/favicon-32x32.png',
|
||||
'/img/favicon/favicon-16x16.png',
|
||||
'/img/favicon/favicon.ico',
|
||||
|
||||
Reference in New Issue
Block a user