Merge branch 'develop' into feature/#32-option-menu
# Conflicts: # src/stylesheets/enhancements/_lists.scss
This commit is contained in:
commit
99b50f4786
36
package-lock.json
generated
36
package-lock.json
generated
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "aniwatch-plus",
|
||||
"version": "0.3.0-beta",
|
||||
"version": "0.3.1-beta",
|
||||
"lockfileVersion": 1,
|
||||
"requires": true,
|
||||
"dependencies": {
|
||||
|
@ -13,9 +13,9 @@
|
|||
}
|
||||
},
|
||||
"@babel/compat-data": {
|
||||
"version": "7.12.1",
|
||||
"resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.12.1.tgz",
|
||||
"integrity": "sha512-725AQupWJZ8ba0jbKceeFblZTY90McUBWMwHhkFQ9q1zKPJ95GUktljFcgcsIVwRnTnRKlcYzfiNImg5G9m6ZQ==",
|
||||
"version": "7.12.5",
|
||||
"resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.12.5.tgz",
|
||||
"integrity": "sha512-DTsS7cxrsH3by8nqQSpFSyjSfSYl57D6Cf4q8dW3LK83tBKBDCkfcay1nYkXq1nIHXnpX8WMMb/O25HOy3h1zg==",
|
||||
"dev": true
|
||||
},
|
||||
"@babel/core": {
|
||||
|
@ -281,18 +281,18 @@
|
|||
}
|
||||
},
|
||||
"@babel/helper-module-imports": {
|
||||
"version": "7.12.1",
|
||||
"resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.12.1.tgz",
|
||||
"integrity": "sha512-ZeC1TlMSvikvJNy1v/wPIazCu3NdOwgYZLIkmIyAsGhqkNpiDoQQRmaCK8YP4Pq3GPTLPV9WXaPCJKvx06JxKA==",
|
||||
"version": "7.12.5",
|
||||
"resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.12.5.tgz",
|
||||
"integrity": "sha512-SR713Ogqg6++uexFRORf/+nPXMmWIn80TALu0uaFb+iQIUoR7bOC7zBWyzBs5b3tBBJXuyD0cRu1F15GyzjOWA==",
|
||||
"dev": true,
|
||||
"requires": {
|
||||
"@babel/types": "^7.12.1"
|
||||
"@babel/types": "^7.12.5"
|
||||
},
|
||||
"dependencies": {
|
||||
"@babel/types": {
|
||||
"version": "7.12.1",
|
||||
"resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.1.tgz",
|
||||
"integrity": "sha512-BzSY3NJBKM4kyatSOWh3D/JJ2O3CVzBybHWxtgxnggaxEuaSTTDqeiSb/xk9lrkw2Tbqyivw5ZU4rT+EfznQsA==",
|
||||
"version": "7.12.5",
|
||||
"resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.5.tgz",
|
||||
"integrity": "sha512-gyTcvz7JFa4V45C0Zklv//GmFOAal5fL23OWpBLqc4nZ4Yrz67s4kCNwSK1Gu0MXGTU8mRY3zJYtacLdKXlzig==",
|
||||
"dev": true,
|
||||
"requires": {
|
||||
"@babel/helper-validator-identifier": "^7.10.4",
|
||||
|
@ -9256,14 +9256,14 @@
|
|||
"dev": true
|
||||
},
|
||||
"postcss": {
|
||||
"version": "8.1.4",
|
||||
"resolved": "https://registry.npmjs.org/postcss/-/postcss-8.1.4.tgz",
|
||||
"integrity": "sha512-LfqcwgMq9LOd8pX7K2+r2HPitlIGC5p6PoZhVELlqhh2YGDVcXKpkCseqan73Hrdik6nBd2OvoDPUaP/oMj9hQ==",
|
||||
"version": "8.1.6",
|
||||
"resolved": "https://registry.npmjs.org/postcss/-/postcss-8.1.6.tgz",
|
||||
"integrity": "sha512-JuifSl4h8dJ70SiMXKjzCxhalE6p2TnMHuq9G8ftyXj2jg6SXzqCsEuxMj9RkmJoO5D+Z9YrWunNkxqpRT02qg==",
|
||||
"dev": true,
|
||||
"requires": {
|
||||
"colorette": "^1.2.1",
|
||||
"line-column": "^1.0.2",
|
||||
"nanoid": "^3.1.15",
|
||||
"nanoid": "^3.1.16",
|
||||
"source-map": "^0.6.1"
|
||||
},
|
||||
"dependencies": {
|
||||
|
@ -11242,9 +11242,9 @@
|
|||
"dev": true
|
||||
},
|
||||
"sass": {
|
||||
"version": "1.28.0",
|
||||
"resolved": "https://registry.npmjs.org/sass/-/sass-1.28.0.tgz",
|
||||
"integrity": "sha512-9FWX/0wuE1KxwfiP02chZhHaPzu6adpx9+wGch7WMOuHy5npOo0UapRI3FNSHva2CczaYJu2yNUBN8cCSqHz/A==",
|
||||
"version": "1.29.0",
|
||||
"resolved": "https://registry.npmjs.org/sass/-/sass-1.29.0.tgz",
|
||||
"integrity": "sha512-ZpwAUFgnvAUCdkjwPREny+17BpUj8nh5Yr6zKPGtLNTLrmtoRYIjm7njP24COhjJldjwW1dcv52Lpf4tNZVVRA==",
|
||||
"dev": true,
|
||||
"requires": {
|
||||
"chokidar": ">=2.0.0 <4.0.0"
|
||||
|
|
10
package.json
10
package.json
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "aniwatch-plus",
|
||||
"version": "0.3.0-beta",
|
||||
"version": "0.3.1-beta",
|
||||
"description": "Aniwatch Plus is a browser extension for https://aniwatch.me/",
|
||||
"main": "index.js",
|
||||
"scripts": {
|
||||
|
@ -36,9 +36,9 @@
|
|||
"uuid": "^8.3.1"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@babel/compat-data": "^7.12.1",
|
||||
"@babel/compat-data": "^7.12.5",
|
||||
"@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-private-methods": "^7.12.1",
|
||||
"@babel/preset-env": "^7.12.1",
|
||||
|
@ -66,8 +66,8 @@
|
|||
"gulp-terser": "^1.4.1",
|
||||
"gulp-zip": "^5.0.2",
|
||||
"merge-stream": "^2.0.0",
|
||||
"postcss": "^8.1.4",
|
||||
"sass": "^1.28.0",
|
||||
"postcss": "^8.1.6",
|
||||
"sass": "^1.29.0",
|
||||
"terser": "^5.3.8",
|
||||
"vinyl-buffer": "^1.0.1",
|
||||
"vinyl-source-stream": "^2.0.0"
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
{
|
||||
"name": "Aniwatch Plus",
|
||||
"short_name": "AW+",
|
||||
"version": "0.3.0.0",
|
||||
"version_name": "0.3.0 Beta",
|
||||
"version": "0.3.1.0",
|
||||
"version_name": "0.3.1 Beta",
|
||||
"description": "Aniwatch Plus is an unofficial extension which provides several UI improvments for https://aniwatch.me.",
|
||||
"permissions": [
|
||||
"storage",
|
||||
|
|
|
@ -1,5 +1,7 @@
|
|||
md-list-item {
|
||||
&: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;
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue