Merge branch 'preview' of https://github.com/the1812/Bilibili-Evolved into preview

This commit is contained in:
Coulomb_G 2019-08-07 20:34:09 +08:00
commit f49d570e54
12 changed files with 40 additions and 19 deletions

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -712,7 +712,7 @@ class Observer {
}
videoChangeCallbacks.push(callback)
}
}
}
class SpinQuery {
constructor (query, condition, action, failed) {
@ -1504,6 +1504,7 @@ Resource.manifest = {
},
about: {
path: 'about.min.js',
alwaysPreview: true,
html: true,
style: 'important',
displayNames: {

View File

@ -712,7 +712,7 @@ class Observer {
}
videoChangeCallbacks.push(callback)
}
}
}
class SpinQuery {
constructor (query, condition, action, failed) {
@ -1504,6 +1504,7 @@ Resource.manifest = {
},
about: {
path: 'about.min.js',
alwaysPreview: true,
html: true,
style: 'important',
displayNames: {

View File

@ -9,6 +9,7 @@
# 历史
| 时间 | 用户名 | 单号后4位 | 金额 |
| ------------------- | ------ | --------- | ------ |
| 2019.07.31 20:49:07 | *耀宇 | 5181 | ¥50.00 |
| 2019.04.28 09:33:31 | *飞 | 4775 | ¥10.00 |
| 2019.03.18 11:22:34 | N*v | 2298 | ¥2.00 |
| 2019.02.03 00:40:46 | *博睿 | 2418 | ¥6.00 |

2
min/about.min.js vendored
View File

@ -1 +1 @@
(()=>{return(t,e)=>{(async()=>{const i=await e.importAsync("aboutHtml");document.body.insertAdjacentHTML("beforeend",i);const o=(t,e)=>t.charCodeAt(0)-e.charCodeAt(0);const n=(t,e)=>o(t.name,e.name);const s=GM_info.script.name.match(/Bilibili Evolved \((.*)\)/);const a=s?s[1]:"Stable";new Vue({el:".bilibili-evolved-about",data:{version:t.currentVersion,clientType:a,logoImage:null,logoImageDark:null,branch:null,authors:[{name:"Grant Howard",link:"https://github.com/the1812"},{name:"Coulomb-G",link:"https://github.com/Coulomb-G"}],contributors:[{name:"PleiadeSubaru",link:"https://github.com/Etherrrr"}].sort(n),fetching:true,participants:[],supporters:["*飞","N*v","*博睿","*杨","*泽鹏"].sort(o),websites:[{name:"GitHub",link:"https://github.com/the1812/Bilibili-Evolved/"},{name:"Greasy Fork",link:"https://greasyfork.org/zh-CN/scripts/373563-bilibili-evolved"}],components:[{name:"Vue.js",link:"https://cn.vuejs.org/index.html"},{name:"JSZip",link:"https://stuk.github.io/jszip/"},{name:"jQuery",link:"http://jquery.com/"},{name:"debounce",link:"https://github.com/component/debounce/"},{name:"Slip.js",link:"https://github.com/kornelski/slip"},{name:"MDI",link:"https://materialdesignicons.com"}]},mounted(){document.querySelector(".bilibili-evolved-about").addEventListener("be:about-load",()=>{this.init()},{once:true})},methods:{async getLogos(){this.logoImage=await Ajax.getText(`https://raw.githubusercontent.com/the1812/Bilibili-Evolved/preview/images/bilibili-evolved-wide.svg`);this.logoImageDark=await Ajax.getText(`https://raw.githubusercontent.com/the1812/Bilibili-Evolved/preview/images/bilibili-evolved-wide-dark.svg`)},async init(){this.branch=/Preview|Local/.test(a)?"preview":"master";this.getLogos();const t=new Set;let e=[];let i=1;do{e=await Ajax.getJson(`https://api.github.com/repos/the1812/Bilibili-Evolved/issues?state=all&direction=asc&per_page=100&page=${i}`).catch(()=>{e=[{name:"电波无法到达(´・_・`)",link:null}]});i++;for(const i of e){t.add(i.user.login)}}while(e.length>0);this.participants=[...t].map(t=>{return{name:t,link:`https://github.com/${t}`}}).filter(({link:t})=>{return!this.authors.some(e=>e.link===t)&&!this.contributors.some(e=>e.link===t)}).sort(n);this.fetching=false}}})})()}})();
(()=>{return(t,e)=>{(async()=>{const i=await e.importAsync("aboutHtml");document.body.insertAdjacentHTML("beforeend",i);const o=(t,e)=>t.charCodeAt(0)-e.charCodeAt(0);const n=(t,e)=>o(t.name,e.name);const s=GM_info.script.name.match(/Bilibili Evolved \((.*)\)/);const a=s?s[1]:"Stable";new Vue({el:".bilibili-evolved-about",data:{version:t.currentVersion,clientType:a,logoImage:null,logoImageDark:null,branch:null,authors:[{name:"Grant Howard",link:"https://github.com/the1812"},{name:"Coulomb-G",link:"https://github.com/Coulomb-G"}],contributors:[{name:"PleiadeSubaru",link:"https://github.com/Etherrrr"}].sort(n),fetching:true,participants:[],supporters:["*耀宇","*飞","N*v","*博睿","*杨","*泽鹏"].sort(o),websites:[{name:"GitHub",link:"https://github.com/the1812/Bilibili-Evolved/"},{name:"Greasy Fork",link:"https://greasyfork.org/zh-CN/scripts/373563-bilibili-evolved"}],components:[{name:"Vue.js",link:"https://cn.vuejs.org/index.html"},{name:"JSZip",link:"https://stuk.github.io/jszip/"},{name:"jQuery",link:"http://jquery.com/"},{name:"debounce",link:"https://github.com/component/debounce/"},{name:"Slip.js",link:"https://github.com/kornelski/slip"},{name:"MDI",link:"https://materialdesignicons.com"}]},mounted(){document.querySelector(".bilibili-evolved-about").addEventListener("be:about-load",()=>{this.init()},{once:true})},methods:{async getLogos(){this.logoImage=await Ajax.getText(`https://raw.githubusercontent.com/the1812/Bilibili-Evolved/preview/images/bilibili-evolved-wide.svg`);this.logoImageDark=await Ajax.getText(`https://raw.githubusercontent.com/the1812/Bilibili-Evolved/preview/images/bilibili-evolved-wide-dark.svg`)},async init(){this.branch=/Preview|Local/.test(a)?"preview":"master";this.getLogos();const t=new Set;let e=[];let i=1;do{e=await Ajax.getJson(`https://api.github.com/repos/the1812/Bilibili-Evolved/issues?state=all&direction=asc&per_page=100&page=${i}`).catch(()=>{e=[{name:"电波无法到达(´・_・`)",link:null}]});i++;for(const i of e){t.add(i.user.login)}}while(e.length>0);this.participants=[...t].map(t=>{return{name:t,link:`https://github.com/${t}`}}).filter(({link:t})=>{return!this.authors.some(e=>e.link===t)&&!this.contributors.some(e=>e.link===t)}).sort(n);this.fetching=false}}})})()}})();

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -305,6 +305,7 @@ Resource.manifest = {
},
about: {
path: 'about.min.js',
alwaysPreview: true,
html: true,
style: 'important',
displayNames: {

View File

@ -1092,7 +1092,9 @@ li.nav-item[report-id='playpage_dynamic'] .i-frame,
body.all-navbar-fill .link-navbar,
body.all-navbar-fill .nav-header-wrapper,
body.all-navbar-fill .link-navbar .main-ctnr .nav-items-ctnr
body.all-navbar-fill .link-navbar .main-ctnr .nav-items-ctnr,
body.all-navbar-fill .manga-navbar,
body.all-navbar-fill .manga-navbar .search-bar .search-bar-bg
{
background-color: var(--theme-color) !important;
}
@ -1101,7 +1103,8 @@ body.all-navbar-fill .nav-header-wrapper .nav-header .nav-header-logo,
body.all-navbar-fill .nav-header-wrapper .nav-header .nav-header-tv-icon,
body.all-navbar-fill .nav-header-wrapper .nav-header .search-icon,
body.all-navbar-fill .link-navbar .main-ctnr .nav-logo::before,
body.all-navbar-fill .link-navbar .main-ctnr .nav-switcher.open-btn
body.all-navbar-fill .link-navbar .main-ctnr .nav-switcher.open-btn,
body.all-navbar-fill .manga-navbar .nav-list .nav-item .item-icon
{
filter: brightness(0) invert(1) !important;
opacity: 0.8666666;
@ -1121,7 +1124,11 @@ body.all-navbar-fill .shortcuts-ctnr .shortcut-item,
body.all-navbar-fill .my-link-btn,
body.all-navbar-fill .link-navbar .main-ctnr .nav-switcher i,
body.all-navbar-fill .link-navbar .main-ctnr .nav-switcher i:hover,
body.all-navbar-fill .link-navbar.black .my-link-btn .label
body.all-navbar-fill .link-navbar.black .my-link-btn .label,
body.all-navbar-fill .manga-navbar .search-bar .placeholder-list .placeholder-item,
body.all-navbar-fill .manga-navbar .search-bar .search-input,
body.all-navbar-fill .manga-navbar .nav-list .nav-item,
body.all-navbar-fill .manga-navbar .action-button
{
color: var(--foreground-color-d) !important;
}
@ -1133,14 +1140,16 @@ body.all-navbar-fill .nav-header-wrapper .nav-header .nav-header-search-bar::pla
color: white !important;
}
body.all-navbar-fill .link-navbar .search-bar-ctnr .search-bar input::placeholder,
body.all-navbar-fill .nav-header-wrapper .nav-header .nav-header-search-bar::placeholder
body.all-navbar-fill .nav-header-wrapper .nav-header .nav-header-search-bar::placeholder,
body.all-navbar-fill .manga-navbar .search-bar .placeholder-list .placeholder-item
{
opacity: 0.7 !important;
}
body.all-navbar-fill .nav-header-wrapper .nav-header .nav-header-search-bar,
body.all-navbar-fill .link-navbar .search-bar-ctnr .search-bar
body.all-navbar-fill .link-navbar .search-bar-ctnr .search-bar,
body.all-navbar-fill .manga-navbar .search-bar .search-bar-bg
{
box-shadow: 0px 1px 4px 0 #0004;
box-shadow: 0px 1px 4px 0 #0002;
}
body.all-navbar-fill .link-navbar .nav-item:hover,
body.all-navbar-fill .link-navbar .shortcuts-ctnr .shortcut-item:hover,
@ -1174,6 +1183,10 @@ body.all-navbar-fill .link-navbar .nav-item
{
transition: all .2s ease-out;
}
body.all-navbar-fill .manga-navbar .search-bar .confirm-btn .search-icon
{
visibility: hidden !important;
}
@media screen and (max-width: 1400px)

View File

@ -32,6 +32,7 @@
fetching: true,
participants: [],
supporters: [
'*耀宇',
'*飞',
'N*v',
'*博睿',

View File

@ -575,6 +575,7 @@ li.category.folded i.icon-arrow
box-shadow: #0004 0 2px 4px;
height: 40px;
box-sizing: border-box;
-webkit-tap-highlight-color: transparent !important;
}
.gui-settings-flat-button:disabled
{