Serraniel/AniwatchPlus
Serraniel/AniwatchPlus
1
0
Fork 0
Code Issues 9 Pull requests 8 Packages Projects Releases 10 Wiki Activity

Merge branch 'develop' into feature/#32-option-menu

Browse source 
# Conflicts:
#	src/stylesheets/enhancements/_lists.scss
This commit is contained in:
Serraniel 2020-11-07 18:50:35 +01:00
parent 4d809dae12 18945a1fc9
commit 99b50f4786
Signed by: Serraniel
GPG key ID: 3690B4E7364525D3
4 changed files with 28 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
package-lock.json generated
View file

@ -1,6 +1,6 @@
{ {
"name": "aniwatch-plus", "name": "aniwatch-plus",
"version": "0.3.0-beta", "version": "0.3.1-beta",
"lockfileVersion": 1, "lockfileVersion": 1,
"requires": true, "requires": true,
"dependencies": { "dependencies": {
@ -13,9 +13,9 @@
} }
}, },
"@babel/compat-data": { "@babel/compat-data": {
"version": "7.12.1", "version": "7.12.5",
"resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.12.1.tgz", "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.12.5.tgz",
"integrity": "sha512-725AQupWJZ8ba0jbKceeFblZTY90McUBWMwHhkFQ9q1zKPJ95GUktljFcgcsIVwRnTnRKlcYzfiNImg5G9m6ZQ==", "integrity": "sha512-DTsS7cxrsH3by8nqQSpFSyjSfSYl57D6Cf4q8dW3LK83tBKBDCkfcay1nYkXq1nIHXnpX8WMMb/O25HOy3h1zg==",
"dev": true "dev": true
}, },
"@babel/core": { "@babel/core": {
@ -281,18 +281,18 @@
} }
}, },
"@babel/helper-module-imports": { "@babel/helper-module-imports": {
"version": "7.12.1", "version": "7.12.5",
"resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.12.1.tgz", "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.12.5.tgz",
"integrity": "sha512-ZeC1TlMSvikvJNy1v/wPIazCu3NdOwgYZLIkmIyAsGhqkNpiDoQQRmaCK8YP4Pq3GPTLPV9WXaPCJKvx06JxKA==", "integrity": "sha512-SR713Ogqg6++uexFRORf/+nPXMmWIn80TALu0uaFb+iQIUoR7bOC7zBWyzBs5b3tBBJXuyD0cRu1F15GyzjOWA==",
"dev": true, "dev": true,
"requires": { "requires": {
"@babel/types": "^7.12.1" "@babel/types": "^7.12.5"
}, },
"dependencies": { "dependencies": {
"@babel/types": { "@babel/types": {
"version": "7.12.1", "version": "7.12.5",
"resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.1.tgz", "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.5.tgz",
"integrity": "sha512-BzSY3NJBKM4kyatSOWh3D/JJ2O3CVzBybHWxtgxnggaxEuaSTTDqeiSb/xk9lrkw2Tbqyivw5ZU4rT+EfznQsA==", "integrity": "sha512-gyTcvz7JFa4V45C0Zklv//GmFOAal5fL23OWpBLqc4nZ4Yrz67s4kCNwSK1Gu0MXGTU8mRY3zJYtacLdKXlzig==",
"dev": true, "dev": true,
"requires": { "requires": {
"@babel/helper-validator-identifier": "^7.10.4", "@babel/helper-validator-identifier": "^7.10.4",
@ -9256,14 +9256,14 @@
"dev": true "dev": true
}, },
"postcss": { "postcss": {
"version": "8.1.4", "version": "8.1.6",
"resolved": "https://registry.npmjs.org/postcss/-/postcss-8.1.4.tgz", "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.1.6.tgz",
"integrity": "sha512-LfqcwgMq9LOd8pX7K2+r2HPitlIGC5p6PoZhVELlqhh2YGDVcXKpkCseqan73Hrdik6nBd2OvoDPUaP/oMj9hQ==", "integrity": "sha512-JuifSl4h8dJ70SiMXKjzCxhalE6p2TnMHuq9G8ftyXj2jg6SXzqCsEuxMj9RkmJoO5D+Z9YrWunNkxqpRT02qg==",
"dev": true, "dev": true,
"requires": { "requires": {
"colorette": "^1.2.1", "colorette": "^1.2.1",
"line-column": "^1.0.2", "line-column": "^1.0.2",
"nanoid": "^3.1.15", "nanoid": "^3.1.16",
"source-map": "^0.6.1" "source-map": "^0.6.1"
}, },
"dependencies": { "dependencies": {
@ -11242,9 +11242,9 @@
"dev": true "dev": true
}, },
"sass": { "sass": {
"version": "1.28.0", "version": "1.29.0",
"resolved": "https://registry.npmjs.org/sass/-/sass-1.28.0.tgz", "resolved": "https://registry.npmjs.org/sass/-/sass-1.29.0.tgz",
"integrity": "sha512-9FWX/0wuE1KxwfiP02chZhHaPzu6adpx9+wGch7WMOuHy5npOo0UapRI3FNSHva2CczaYJu2yNUBN8cCSqHz/A==", "integrity": "sha512-ZpwAUFgnvAUCdkjwPREny+17BpUj8nh5Yr6zKPGtLNTLrmtoRYIjm7njP24COhjJldjwW1dcv52Lpf4tNZVVRA==",
"dev": true, "dev": true,
"requires": { "requires": {
"chokidar": ">=2.0.0 <4.0.0" "chokidar": ">=2.0.0 <4.0.0"

10
package.json
View file

@ -1,6 +1,6 @@
{ {
"name": "aniwatch-plus", "name": "aniwatch-plus",
"version": "0.3.0-beta", "version": "0.3.1-beta",
"description": "Aniwatch Plus is a browser extension for https://aniwatch.me/", "description": "Aniwatch Plus is a browser extension for https://aniwatch.me/",
"main": "index.js", "main": "index.js",
"scripts": { "scripts": {
@ -36,9 +36,9 @@
"uuid": "^8.3.1" "uuid": "^8.3.1"
}, },
"devDependencies": { "devDependencies": {
"@babel/compat-data": "^7.12.1", "@babel/compat-data": "^7.12.5",
"@babel/core": "^7.12.3", "@babel/core": "^7.12.3",
"@babel/helper-module-imports": "^7.12.1", "@babel/helper-module-imports": "^7.12.5",
"@babel/plugin-proposal-class-properties": "^7.12.1", "@babel/plugin-proposal-class-properties": "^7.12.1",
"@babel/plugin-proposal-private-methods": "^7.12.1", "@babel/plugin-proposal-private-methods": "^7.12.1",
"@babel/preset-env": "^7.12.1", "@babel/preset-env": "^7.12.1",
@ -66,8 +66,8 @@
"gulp-terser": "^1.4.1", "gulp-terser": "^1.4.1",
"gulp-zip": "^5.0.2", "gulp-zip": "^5.0.2",
"merge-stream": "^2.0.0", "merge-stream": "^2.0.0",
"postcss": "^8.1.4", "postcss": "^8.1.6",
"sass": "^1.28.0", "sass": "^1.29.0",
"terser": "^5.3.8", "terser": "^5.3.8",
"vinyl-buffer": "^1.0.1", "vinyl-buffer": "^1.0.1",
"vinyl-source-stream": "^2.0.0" "vinyl-source-stream": "^2.0.0"

4
src/manifests/manifest.template.json
View file

@ -1,8 +1,8 @@
{ {
"name": "Aniwatch Plus", "name": "Aniwatch Plus",
"short_name": "AW+", "short_name": "AW+",
"version": "0.3.0.0", "version": "0.3.1.0",
"version_name": "0.3.0 Beta", "version_name": "0.3.1 Beta",
"description": "Aniwatch Plus is an unofficial extension which provides several UI improvments for https://aniwatch.me.", "description": "Aniwatch Plus is an unofficial extension which provides several UI improvments for https://aniwatch.me.",
"permissions": [ "permissions": [
"storage", "storage",

4
src/stylesheets/enhancements/_lists.scss
View file

@ -1,5 +1,7 @@
md-list-item { md-list-item {
&:not(:last-child):not(.awp-list-disabled) { &:not(:last-child):not(.awp-list-disabled) {
border-bottom: 1px solid $gray; // added important to override aniwatch new introduced border which has a different, more "aggressive" color
// https://canary.discord.com/channels/541683465599451136/543812424541798421/773621830161268756
border-bottom: 1px solid $gray !important;
} }
} }