29 Commits

Author SHA1 Message Date
6e9cfa638b Bump socket.io-parser and browser-sync
Bumps [socket.io-parser](https://github.com/socketio/socket.io-parser) to 4.2.1 and updates ancestor dependency [browser-sync](https://github.com/BrowserSync/browser-sync). These dependencies need to be updated together.


Updates `socket.io-parser` from 3.2.0 to 4.2.1
- [Release notes](https://github.com/socketio/socket.io-parser/releases)
- [Changelog](https://github.com/socketio/socket.io-parser/blob/main/CHANGELOG.md)
- [Commits](https://github.com/socketio/socket.io-parser/compare/3.2.0...4.2.1)

Updates `browser-sync` from 2.26.7 to 2.27.10
- [Release notes](https://github.com/BrowserSync/browser-sync/releases)
- [Changelog](https://github.com/BrowserSync/browser-sync/blob/master/CHANGELOG.md)
- [Commits](https://github.com/BrowserSync/browser-sync/compare/v2.26.7...v2.27.10)

---
updated-dependencies:
- dependency-name: socket.io-parser
  dependency-type: indirect
- dependency-name: browser-sync
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-10-30 15:18:40 +00:00
d57f1ac75a Merge pull request #22 from thefeli73/dependabot/npm_and_yarn/color-string-1.5.5
Bump color-string from 1.5.3 to 1.5.5
2021-07-01 22:42:57 +02:00
99ee61e110 Merge pull request #21 from thefeli73/dependabot/npm_and_yarn/postcss-7.0.36
Bump postcss from 7.0.21 to 7.0.36
2021-07-01 22:42:47 +02:00
29377d03c4 Merge pull request #20 from thefeli73/dependabot/npm_and_yarn/browserslist-4.16.6
Bump browserslist from 4.7.2 to 4.16.6
2021-07-01 22:42:38 +02:00
1de0c61d3a Bump browserslist from 4.7.2 to 4.16.6
Bumps [browserslist](https://github.com/browserslist/browserslist) from 4.7.2 to 4.16.6.
- [Release notes](https://github.com/browserslist/browserslist/releases)
- [Changelog](https://github.com/browserslist/browserslist/blob/main/CHANGELOG.md)
- [Commits](https://github.com/browserslist/browserslist/compare/4.7.2...4.16.6)

Signed-off-by: dependabot[bot] <support@github.com>
2021-07-01 20:42:29 +00:00
bbc4765ea7 Merge pull request #19 from thefeli73/dependabot/npm_and_yarn/hosted-git-info-2.8.9
Bump hosted-git-info from 2.8.5 to 2.8.9
2021-07-01 22:42:26 +02:00
2754120e90 Bump color-string from 1.5.3 to 1.5.5
Bumps [color-string](https://github.com/Qix-/color-string) from 1.5.3 to 1.5.5.
- [Release notes](https://github.com/Qix-/color-string/releases)
- [Changelog](https://github.com/Qix-/color-string/blob/master/CHANGELOG.md)
- [Commits](https://github.com/Qix-/color-string/commits/1.5.5)

---
updated-dependencies:
- dependency-name: color-string
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-07-01 20:42:19 +00:00
0fbe5cb668 Merge pull request #18 from thefeli73/dependabot/npm_and_yarn/y18n-3.2.2
Bump y18n from 3.2.1 to 3.2.2
2021-07-01 22:42:13 +02:00
edfc34341b Merge pull request #17 from thefeli73/dependabot/npm_and_yarn/ini-1.3.8
Bump ini from 1.3.5 to 1.3.8
2021-07-01 22:41:48 +02:00
8c16978c57 Merge pull request #16 from thefeli73/dependabot/npm_and_yarn/node-sass-4.14.1
Bump node-sass from 4.13.0 to 4.14.1
2021-07-01 22:41:40 +02:00
baa8a98d9f Bump postcss from 7.0.21 to 7.0.36
Bumps [postcss](https://github.com/postcss/postcss) from 7.0.21 to 7.0.36.
- [Release notes](https://github.com/postcss/postcss/releases)
- [Changelog](https://github.com/postcss/postcss/blob/main/CHANGELOG.md)
- [Commits](https://github.com/postcss/postcss/compare/7.0.21...7.0.36)

---
updated-dependencies:
- dependency-name: postcss
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-06-16 13:53:55 +00:00
57d62af1ea Bump hosted-git-info from 2.8.5 to 2.8.9
Bumps [hosted-git-info](https://github.com/npm/hosted-git-info) from 2.8.5 to 2.8.9.
- [Release notes](https://github.com/npm/hosted-git-info/releases)
- [Changelog](https://github.com/npm/hosted-git-info/blob/v2.8.9/CHANGELOG.md)
- [Commits](https://github.com/npm/hosted-git-info/compare/v2.8.5...v2.8.9)

Signed-off-by: dependabot[bot] <support@github.com>
2021-05-11 07:13:57 +00:00
3b285440a8 Bump y18n from 3.2.1 to 3.2.2
Bumps [y18n](https://github.com/yargs/y18n) from 3.2.1 to 3.2.2.
- [Release notes](https://github.com/yargs/y18n/releases)
- [Changelog](https://github.com/yargs/y18n/blob/master/CHANGELOG.md)
- [Commits](https://github.com/yargs/y18n/commits)

Signed-off-by: dependabot[bot] <support@github.com>
2021-03-31 03:43:48 +00:00
9bab70df9a Bump ini from 1.3.5 to 1.3.8
Bumps [ini](https://github.com/isaacs/ini) from 1.3.5 to 1.3.8.
- [Release notes](https://github.com/isaacs/ini/releases)
- [Commits](https://github.com/isaacs/ini/compare/v1.3.5...v1.3.8)

Signed-off-by: dependabot[bot] <support@github.com>
2020-12-12 00:44:31 +00:00
c16c48ff2e Bump node-sass from 4.13.0 to 4.14.1
Bumps [node-sass](https://github.com/sass/node-sass) from 4.13.0 to 4.14.1.
- [Release notes](https://github.com/sass/node-sass/releases)
- [Changelog](https://github.com/sass/node-sass/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sass/node-sass/compare/v4.13.0...v4.14.1)

Signed-off-by: dependabot[bot] <support@github.com>
2020-09-04 20:34:58 +00:00
c5333f8739 add ico to root 2020-04-27 09:11:52 +02:00
c26703ddb3 Merge remote-tracking branch 'meritkollen/develop' into develop 2020-04-09 23:04:56 +02:00
8838a46731 fix robots, google needs assets 2020-04-09 23:04:46 +02:00
40d5ef9b44 fix robots 2020-04-09 22:56:45 +02:00
969501bfaa Update README.md 2020-01-27 12:23:35 +01:00
0e23b19816 Update README.md 2020-01-27 12:23:26 +01:00
dc90a6f512 robots 2020-01-15 18:20:10 +01:00
28a4e4c9d6 package lock 2020-01-08 14:35:23 +01:00
2c91ce5c57 package 2019-12-13 20:39:40 +01:00
7e3741f4eb packagelock 2019-12-01 15:24:37 +01:00
97c46bc23f crawlers should see ads 2019-11-26 15:22:02 +01:00
f20526ae3a added full stop 2019-11-12 20:24:02 +01:00
f9cc87605a Merge branch 'master' into develop 2019-11-12 19:39:22 +01:00
5c9392abcd fix manifest, hardcode hash 2019-11-12 19:35:14 +01:00
8 changed files with 1285 additions and 676 deletions

View File

@ -3,4 +3,6 @@ En enkel meritkalkylator
## Link
https://meritkollen.se/
Release: https://meritkollen.se/
Development: https://dev.meritkollen.se/

1941
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -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"

BIN
src/favicon.ico Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 15 KiB

View File

@ -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"
}
}

View File

@ -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>

View File

@ -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

View File

@ -19,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',