From d890708571a9be6d2a1c26b19946e77afc47dd87 Mon Sep 17 00:00:00 2001 From: the1812 Date: Wed, 28 Nov 2018 12:34:25 +0800 Subject: [PATCH] Bug fixes --- bilibili-evolved.offline.user.js | 6 +++--- bilibili-evolved.preview-offline.user.js | 6 +++--- bilibili-evolved.preview.user.js | 2 +- bilibili-evolved.user.js | 2 +- min/toast.min.scss | 2 +- utils/toast/toast.scss | 4 +++- 6 files changed, 12 insertions(+), 10 deletions(-) diff --git a/bilibili-evolved.offline.user.js b/bilibili-evolved.offline.user.js index 764af0549..91c7dc715 100644 --- a/bilibili-evolved.offline.user.js +++ b/bilibili-evolved.offline.user.js @@ -1,6 +1,6 @@ // ==UserScript== // @name Bilibili Evolved (Offline) -// @version 134.86 +// @version 134.87 // @description 增强哔哩哔哩Web端体验(离线版): 修复界面瑕疵, 删除广告, 使用夜间模式浏览, 下载视频或视频封面, 以及增加对触屏设备的支持等. // @author Grant Howard, Coulomb-G // @copyright 2018, Grant Howrad (https://github.com/the1812) @@ -79,7 +79,7 @@ if (settings.toastInternalError) { Toast.error("stack" in message - ? message.stack.replace(/ at/g, "\n\tat") + ? message.stack : message, "错误"); } console.error(message); @@ -869,7 +869,7 @@ offlineData["https://raw.githubusercontent.com/the1812/Bilibili-Evolved/master/m offlineData["https://raw.githubusercontent.com/the1812/Bilibili-Evolved/master/min/gui-settings.min.scss"] = `.gui-settings-icon-panel{height:100%;display:flex;justify-content:center;align-items:center;position:fixed;top:0;left:0;width:24px;z-index:99999;}.gui-settings{display:flex;justify-content:center;align-items:center;cursor:pointer;-webkit-tap-highlight-color:transparent;transform:translateX(-12px);}.gui-settings.gui-settings-notification::before{content:"";width:6px;height:6px;background:$customStyleColor;position:fixed;right:0;top:0;border-radius:50%;}.gui-settings,.gui-settings-header .gui-settings-close path,.gui-settings svg path{transition:all 0.2s;}.gui-settings svg path{fill:#8884;opacity:0.75;transform-origin:center!important;}.gui-settings:hover{transform:translateX(0px);}.gui-settings:hover svg path{opacity:1;transform:rotate(120deg);}.gui-settings-panel{width:100%;height:100%;background:transparent;position:fixed;left:0;top:0;z-index:100000;display:flex;opacity:0;transform:scale(0);transform-origin:center;align-items:center;justify-content:center;}.gui-settings-panel.opened{opacity:1;transform:scale(1);}.gui-settings-box{width:400px;height:90%;background:white;box-shadow:0px 3px 20px 2px #0004;display:flex;flex-direction:column;line-height:initial;}.gui-settings-footer,.gui-settings-header{flex-grow:0;display:flex;align-items:center;flex-shrink:0;}.gui-settings-footer{height:80px;justify-content:center;position:relative;}.gui-settings-content{flex-grow:1;overflow:auto;position:relative;overscroll-behavior:contain;}.gui-settings-content-top-mask,.gui-settings-content-bottom-mask{height:10px;position:sticky;left:0px;width:100%;z-index:10;}.gui-settings-content-top-mask{background:linear-gradient(to bottom,white,transparent);top:0px;}.gui-settings-content-bottom-mask{background:linear-gradient(to top,white,transparent);bottom:0px;}.gui-settings-content ul{padding:0;margin:0;}.gui-settings-content ul li{font-size:16px;margin-bottom:12px;display:flex;height:24px;transition:all .2s;}.gui-settings-content ul li.disabled,.gui-settings-content ul li:not(.category).folded{height:0;margin:0;overflow:hidden;}.gui-settings-content ul li.indent-0{margin-left:16px;}.gui-settings-content ul li.indent-1{margin-left:80px;}.gui-settings-content ul li.indent-2{margin-left:144px;}.gui-settings-content ul li.indent-center{align-items:center;justify-content:center;}.gui-settings-content ul li.widgets-container{margin:0;height:auto;width:100%;display:flex;flex-wrap:wrap;overflow:visible;}.gui-settings-content ul li.widgets-container>div{align-items:center;justify-content:center;min-width:50%;display:inline-flex;margin-bottom:12px;}.gui-settings-content ul li.category{padding:8px 0;margin-bottom:12px;border-top:1px dashed #8884;border-bottom:1px dashed #8884;background:white;position:sticky;top:0;z-index:10;cursor:pointer;transition:all .2s ease-out;-webkit-tap-highlight-color:transparent;}.gui-settings-content ul li.category.folded{margin-bottom:-1px;}span.settings-category{opacity:0.8;}.gui-settings-title{flex-grow:1;font-size:16px;margin:16px;}.gui-settings-close{width:24px;height:24px;padding:16px;}.gui-settings-header .gui-settings-close{cursor:pointer;-webkit-tap-highlight-color:transparent;}.gui-settings-header .gui-settings-close:hover path{fill:$customStyleColor!important;}.gui-settings-close path{fill:#222;}.gui-settings-ok path{fill:transparent;}.gui-settings-textbox-container{display:flex;justify-content:center;align-items:center;-webkit-tap-highlight-color:transparent;}.gui-settings-textbox-container span,.gui-settings-dropdown-span{margin:0 16px;transition:all 0.2s;}.gui-settings-textbox-container input,.gui-settings-dropdown input{border-radius:4px;border:none;height:100%;max-width:80px;padding:2px 8px;background:#8884;transition:all 0.2s;font-size:16px;}.gui-settings-textbox-container input:disabled,.gui-settings-textbox-container.disabled span,.gui-settings-textbox-container.disabled div{opacity:0.5;}.gui-settings-checkbox-container{cursor:pointer;display:flex;width:100%;justify-content:start;align-items:center;padding:0 16px;-webkit-tap-highlight-color:transparent;}.gui-settings-checkbox-container input{visibility:collapse;transition:all 0.2s;width:0;}.gui-settings-checkbox-container svg{width:24px;height:24px;border-radius:4px;margin-right:16px;transition:all 0.2s;}.gui-settings-checkbox-container svg path{transform:scale(0.8);transform-origin:center;}.gui-settings-checkbox-container input ~ svg{background-color:#8884;}.gui-settings-checkbox-container input:checked ~ svg{background-color:$customStyleColor;}.gui-settings-checkbox-container input:checked ~ svg path{fill:$foreground;}.gui-settings-checkbox-container input:disabled ~ svg,.gui-settings-checkbox-container input:disabled ~ span{opacity:0.5;}button.gui-settings-button{padding:6px 20px;margin:0 4px;max-height:34px;border:none;background:#8884;border-radius:4px;font-size:16px;cursor:pointer;transition:all 0.2s ease-out;font-family:inherit;-webkit-tap-highlight-color:transparent;}button.gui-settings-button:hover{opacity:.9;}button.gui-settings-button:active{opacity:.8;}button.gui-settings-button:focus{outline:none;}button.save{padding:8px 38px;max-height:38px;background:$customStyleColor;color:$foreground;transform-origin:center;}button.save.save-complete{animation:hide-a-moment 3.8s;}@keyframes hide-a-moment{ 0%,100%{transform:scale(1);} 5%,95%{transform:scale(0);}}.gui-settings-footer svg{width:30px;height:30px;margin-left:0;transition:all 0.2s;position:absolute;transform-origin:center;transform:scale(0);}.gui-settings-footer svg.save-complete{animation:show-a-moment 3.8s;}@keyframes show-a-moment{ 0%,5%,95%,100%{transform:scale(0);} 10%,90%{transform:scale(1);}}.gui-settings-footer svg path{fill:$customStyleColor;}.custom-color-preview{width:40px;height:100%;border-radius:4px;background:$customStyleColor;margin-right:16px;border:1px solid #8884;position:relative;cursor:pointer;box-sizing:border-box;}.predefined-colors{transition:all 0.2s;display:flex;opacity:0;background:white;width:168px;height:168px;position:absolute;box-shadow:0px 3px 20px 2px #0004;border-radius:4px;top:32px;left:-64px;transform:scale(0);transform-origin:top;z-index:9;}.predefined-colors.opened{opacity:1;transform:scale(1);}.predefined-colors-grid{display:grid;grid-template-columns:auto auto auto auto;margin:4px;flex-grow:1;}.predefined-colors-grid-block{width:32px;height:32px;border-radius:4px;justify-self:center;align-self:center;cursor:pointer;}input[key]:focus{outline:none;}input[type=text][key]{height:auto;border:none;border-radius:4px;}.gui-settings-label{margin:0 16px;font-size:16px;}.hidden{display:none!important;}@supports (backdrop-filter: blur(24px)) or (-webkit-backdrop-filter: blur(24px)){.gui-settings-box.blur li.category{-webkit-backdrop-filter:blur(24px);backdrop-filter:blur(24px);background:#fffa;}}@supports (backdrop-filter: blur(64px)) or (-webkit-backdrop-filter: blur(64px)){.gui-settings-box.blur{background:transparent;box-shadow:none;}.gui-settings-box.blur .gui-settings-content,.gui-settings-box.blur .gui-settings-header,.gui-settings-box.blur .gui-settings-footer{-webkit-backdrop-filter:blur(64px);backdrop-filter:blur(64px);}.gui-settings-box.blur .gui-settings-content{background:#fffa;}.gui-settings-box.blur .gui-settings-header,.gui-settings-box.blur .gui-settings-footer{background:#fffa;}}.gui-settings-panel.animation{transition:all .2s ease-out;}i.settings-category-arrow{transform-origin:center;transition:all .2s ease-out;transform:translateY(2.828427px) rotate(-135deg);height:100%;display:inline-block;margin-left:12px;}li.category.folded i.settings-category-arrow{transform:translateY(-2.828427px) rotate(45deg);}i.settings-category-arrow::after{content:"";width:8px;height:8px;background-color:transparent;border:2px solid;border-color:black;opacity:.8;display:block;border-left-color:transparent;border-top-color:transparent;border-radius:2.4px;}.gui-settings-dropdown{position:relative;cursor:pointer;display:inline-block;-webkit-tap-highlight-color:transparent;}.gui-settings-dropdown>ul{position:absolute;top:calc(100%);width:100%;cursor:pointer;background:white;transform-origin:top;transform:scaleY(0);transition:all .2s ease-out;display:flex;flex-direction:column;align-items:center;box-shadow:0px 3px 20px 2px #0004;border-radius:4px;}.gui-settings-dropdown ul li{margin:0;padding:8px 0;height:auto;width:100%;justify-content:center;border-radius:4px;}.gui-settings-dropdown ul li:hover{background:rgba(0,0,0,0.16);}.gui-settings-dropdown.opened>ul{transform:scaleY(1);}.gui-settings-dropdown input{cursor:pointer;}.gui-settings-dropdown::after{content:"";border:4px solid black;position:absolute;top:calc(50% - 6px);box-sizing:border-box;right:6px;transform-origin:center;transform:rotate(45deg);border-left-color:transparent;border-top-color:transparent;opacity:.8;}`; offlineData["https://raw.githubusercontent.com/the1812/Bilibili-Evolved/master/min/full-tweets-title.min.css"] = `.dynamic-m .info,.dynamic-m .title{height:auto!important;}.dynamic-m .info a,.dynamic-m .title a,.dynamic-m .title span{white-space:normal!important;}`; offlineData["https://raw.githubusercontent.com/the1812/Bilibili-Evolved/master/min/image-viewer.min.scss"] = `html.image-viewer-opened,body.image-viewer-opened{overflow:hidden!important;}.image-viewer-container{background:rgba(0,0,0,0.85);width:100%;height:100%;position:fixed;top:0;left:0;z-index:100000;display:none;justify-content:center;align-items:center;}.image-viewer-container.opened{display:flex;}.image-viewer{width:90%;height:90%;display:grid;grid-template-columns:auto 48px;grid-template-rows:48px auto 48px;grid-template-areas:"image close" "image ." "image download";grid-column-gap:12px;justify-items:center;justify-content:stretch;align-items:center;align-content:stretch;}.image-viewer .image{grid-area:image;width:auto;height:auto;max-width:100%;max-height:100%;}.image-viewer .close{grid-area:close;}.image-viewer .download{grid-area:download;}.image-viewer-icon{cursor:pointer;width:100%;height:100%;}.image-viewer-icon svg{max-width:48px;max-height:48px;}.image-viewer-icon path{fill:#eee;transition:all 0.2s;transform-origin:center;}.image-viewer-icon:hover path{fill:$customStyleColor;transform:scale(1.2);}`; -offlineData["https://raw.githubusercontent.com/the1812/Bilibili-Evolved/master/min/toast.min.scss"] = `.toast-card-container{position:fixed;left:16px;bottom:16px;display:flex;flex-direction:column;align-items:start;z-index:100001;}.toast-card{background:#222;min-width:240px;max-width:60vw;box-shadow:0 1px 20px 4px rgba(0,0,0,.4);transition:all 0.3s cubic-bezier(0.18,0.89,0.32,1.28);transform:translateY(16px);transform-origin:bottom;opacity:0;overflow:hidden;display:flex;flex-direction:column;border-left-width:4px;border-left-style:solid;}.toast-card.visible{min-height:96px;transform:scale(1) translateY(0);opacity:1;margin-top:16px;}.toast-card-header{display:flex;align-items:center;}.toast-card-title{font-size:18px;color:#fff6;margin:16px;font-weight:bold;flex:1 1 auto;}svg.toast-card-dismiss{height:24px;width:24px;flex:0 0 auto;padding:16px;cursor:pointer;-webkit-tap-highlight-color:transparent;transition:all .2s ease-out;transform-origin:center;}svg.toast-card-dismiss:hover{transform:scale(1.2);}svg.toast-card-dismiss:active{transform:scale(1.1);}svg.toast-card-dismiss path{fill:#fff6;}.toast-card-message{color:#eeed;font-size:14px;margin:16px;margin-top:0;}.toast-card.toast-default{border-left-color:#444;}.toast-card.toast-error{border-left-color:#f44336;}.toast-card.toast-info{border-left-color:#2196F3;}.toast-card.toast-success{border-left-color:#8BC34A;}.toast-card span,.toast-card .link{display:inline-block;padding:4px 6px;margin:0 2px;background-color:rgba(0,0,0,.1);border-radius:4px;text-decoration:none;color:#eeed;transition:all .2s ease-out;}.toast-card .link:hover{background-color:rgba(0,0,0,.2);}.toast-card .link:active{background-color:rgba(0,0,0,.1);}`; +offlineData["https://raw.githubusercontent.com/the1812/Bilibili-Evolved/master/min/toast.min.scss"] = `.toast-card-container{position:fixed;left:16px;bottom:16px;display:flex;flex-direction:column;align-items:start;z-index:100001;}.toast-card{background:#222;min-width:240px;max-width:60vw;box-shadow:0 1px 20px 4px rgba(0,0,0,.4);transition:all 0.3s cubic-bezier(0.18,0.89,0.32,1.28);transform:translateY(16px);transform-origin:bottom;opacity:0;overflow:hidden;display:flex;flex-direction:column;border-left-width:4px;border-left-style:solid;}.toast-card.visible{min-height:96px;transform:scale(1) translateY(0);opacity:1;margin-top:16px;}.toast-card-header{display:flex;align-items:center;}.toast-card-title{font-size:18px;color:#fff6;margin:16px;font-weight:bold;flex:1 1 auto;}svg.toast-card-dismiss{height:24px;width:24px;flex:0 0 auto;padding:16px;cursor:pointer;-webkit-tap-highlight-color:transparent;transition:all .2s ease-out;transform-origin:center;}svg.toast-card-dismiss:hover{transform:scale(1.2);}svg.toast-card-dismiss:active{transform:scale(1.1);}svg.toast-card-dismiss path{fill:#fff6;}.toast-card-message{color:#eeed;font-size:14px;margin:16px;margin-top:0;white-space:pre-wrap;}.toast-card.toast-default{border-left-color:#444;}.toast-card.toast-error{border-left-color:#f44336;}.toast-card.toast-info{border-left-color:#2196F3;}.toast-card.toast-success{border-left-color:#8BC34A;}.toast-card span,.toast-card .link{display:inline-block;padding:4px 6px;margin:0 2px;background-color:rgba(0,0,0,.1);border-radius:4px;text-decoration:none;color:#eeed;transition:all .2s ease-out;}.toast-card .link:hover{background-color:rgba(0,0,0,.2);}.toast-card .link:active{background-color:rgba(0,0,0,.1);}`; offlineData["https://raw.githubusercontent.com/the1812/Bilibili-Evolved/master/min/blur-video-control.min.css"] = `@supports (backdrop-filter: blur(48px)) or (-webkit-backdrop-filter: blur(48px)){.video-control-blur-layer{width:100%;height:100%;position:absolute;-webkit-backdrop-filter:blur(48px);backdrop-filter:blur(48px);z-index:-1;top:0;}.bilibili-player-video-control-mask{background:transparent!important;}.bilibili-player-video-control-bottom,.bui-slider .bui-track.bui-track-video-progress .bui-bar-wrap{background-color:transparent!important;}.bilibili-player-area .bilibili-player-video-control-wrap,.bilibili-player-area .bilibili-player-video-control-bottom{transition:none!important;}}`; offlineData["https://raw.githubusercontent.com/the1812/Bilibili-Evolved/master/min/force-wide.min.scss"] = `@media screen and (min-width: $forceWideMinWidth){.bili-wrapper{width:1160px;}.bili-wrapper .l-con{width:900px;}.bili-header-m .bili-wrapper{width:1160px;}.bili-header-m .bili-wrapper .l-con{width:900px;}.gg-floor-module{width:1160px;max-height:96px;}.bangumi-timing-module .headline .bili-tab{width:650px;}.bangumi-timing-module .headline .bili-tab .bili-tab-item{width:70px;}.bangumi-timing-module .card-timing:first-child:nth-child(4),.bangumi-timing-module .card-timing:nth-child(2):nth-child(4),.bangumi-timing-module .card-timing:nth-child(3):nth-child(4),.bangumi-timing-module .card-timing:nth-child(4):nth-child(4){padding-top:0;}.bangumi-timing-module .card-timing{padding:36px 34px 0 0;}.audio-list .song-list .song-li:nth-child(5n) .content .text{margin-right:0;}.audiolist-list .song-list .song-li:nth-child(5n) .content .text{margin-right:0;}.elevator-module{margin-left:590px;}#primary_menu,#primary_menu>ul.nav-menu,.uns_box li.u-i.b-post{display:flex;align-items:center;justify-content:space-between;}.primary-menu{width:100%;}.primary-menu .nav-menu{flex-grow:1;}.primary-menu .nav-gif{position:static;margin-left:2%;}.primary-menu .nav-menu>li{margin-right:0!important;}.primary-menu .nav-menu>li.home{padding-right:1%;}}`; offlineData["https://raw.githubusercontent.com/the1812/Bilibili-Evolved/master/min/download-video.min.scss"] = `.download-video-panel.opened{transform:scaleY(1);}.download-video-panel{position:absolute;top:calc(100% + 8px);transition:all .16s ease-out;transform-origin:top;transform:scaleY(0);background:white;border-radius:4px;box-shadow:0px 3px 20px 2px #0004;z-index:100;}.gui-settings-content ol.video-quality li,.video-action>div{cursor:pointer;align-items:center;margin:0;padding:8px 16px;border-radius:4px;transition:all .2s ease-out;}.video-action>div{padding:12px 24px;}.gui-settings-content ol.video-quality li:hover,.video-action>div:hover{background:rgba(0,0,0,0.16);}.video-quality,.video-progress,.video-action,.video-error{display:none;}.download-video-panel.quality:not(.error) .video-quality,.download-video-panel.progress:not(.error) .video-progress,.download-video-panel.action:not(.error) .video-action,.download-video-panel.error .video-error{display:block;}.download-progress-text{display:flex;}.download-progress-title{flex:1 0 0;}.download-progress-background{background-color:#8884;height:4px;width:100%;margin-top:4px;}.download-progress-foreground{background-color:$customStyleColor;transform-origin:left;transition:all .2s ease-out;transform:scaleX(0);height:100%;width:100%;}.download-progress-cancel{margin-top:8px;display:flex;justify-content:center;}.download-progress-cancel>span{border-radius:4px;background-color:#8884;padding:4px 8px;cursor:pointer;}.download-progress-cancel>span:hover{opacity:.9;}.download-progress-cancel>span:active{opacity:.8;}.video-error,.video-progress{padding:12px;}.video-progress{min-width:160px;}#video-complete{display:none;}`; diff --git a/bilibili-evolved.preview-offline.user.js b/bilibili-evolved.preview-offline.user.js index 5a22b45d0..62445ae1c 100644 --- a/bilibili-evolved.preview-offline.user.js +++ b/bilibili-evolved.preview-offline.user.js @@ -1,6 +1,6 @@ // ==UserScript== // @name Bilibili Evolved (Preview Offline) -// @version 134.86 +// @version 134.87 // @description 增强哔哩哔哩Web端体验(预览离线版): 修复界面瑕疵, 删除广告, 使用夜间模式浏览, 下载视频或视频封面, 以及增加对触屏设备的支持等. // @author Grant Howard, Coulomb-G // @copyright 2018, Grant Howrad (https://github.com/the1812) @@ -79,7 +79,7 @@ if (settings.toastInternalError) { Toast.error("stack" in message - ? message.stack.replace(/ at/g, "\n\tat") + ? message.stack : message, "错误"); } console.error(message); @@ -869,7 +869,7 @@ offlineData["https://raw.githubusercontent.com/the1812/Bilibili-Evolved/master/m offlineData["https://raw.githubusercontent.com/the1812/Bilibili-Evolved/master/min/gui-settings.min.scss"] = `.gui-settings-icon-panel{height:100%;display:flex;justify-content:center;align-items:center;position:fixed;top:0;left:0;width:24px;z-index:99999;}.gui-settings{display:flex;justify-content:center;align-items:center;cursor:pointer;-webkit-tap-highlight-color:transparent;transform:translateX(-12px);}.gui-settings.gui-settings-notification::before{content:"";width:6px;height:6px;background:$customStyleColor;position:fixed;right:0;top:0;border-radius:50%;}.gui-settings,.gui-settings-header .gui-settings-close path,.gui-settings svg path{transition:all 0.2s;}.gui-settings svg path{fill:#8884;opacity:0.75;transform-origin:center!important;}.gui-settings:hover{transform:translateX(0px);}.gui-settings:hover svg path{opacity:1;transform:rotate(120deg);}.gui-settings-panel{width:100%;height:100%;background:transparent;position:fixed;left:0;top:0;z-index:100000;display:flex;opacity:0;transform:scale(0);transform-origin:center;align-items:center;justify-content:center;}.gui-settings-panel.opened{opacity:1;transform:scale(1);}.gui-settings-box{width:400px;height:90%;background:white;box-shadow:0px 3px 20px 2px #0004;display:flex;flex-direction:column;line-height:initial;}.gui-settings-footer,.gui-settings-header{flex-grow:0;display:flex;align-items:center;flex-shrink:0;}.gui-settings-footer{height:80px;justify-content:center;position:relative;}.gui-settings-content{flex-grow:1;overflow:auto;position:relative;overscroll-behavior:contain;}.gui-settings-content-top-mask,.gui-settings-content-bottom-mask{height:10px;position:sticky;left:0px;width:100%;z-index:10;}.gui-settings-content-top-mask{background:linear-gradient(to bottom,white,transparent);top:0px;}.gui-settings-content-bottom-mask{background:linear-gradient(to top,white,transparent);bottom:0px;}.gui-settings-content ul{padding:0;margin:0;}.gui-settings-content ul li{font-size:16px;margin-bottom:12px;display:flex;height:24px;transition:all .2s;}.gui-settings-content ul li.disabled,.gui-settings-content ul li:not(.category).folded{height:0;margin:0;overflow:hidden;}.gui-settings-content ul li.indent-0{margin-left:16px;}.gui-settings-content ul li.indent-1{margin-left:80px;}.gui-settings-content ul li.indent-2{margin-left:144px;}.gui-settings-content ul li.indent-center{align-items:center;justify-content:center;}.gui-settings-content ul li.widgets-container{margin:0;height:auto;width:100%;display:flex;flex-wrap:wrap;overflow:visible;}.gui-settings-content ul li.widgets-container>div{align-items:center;justify-content:center;min-width:50%;display:inline-flex;margin-bottom:12px;}.gui-settings-content ul li.category{padding:8px 0;margin-bottom:12px;border-top:1px dashed #8884;border-bottom:1px dashed #8884;background:white;position:sticky;top:0;z-index:10;cursor:pointer;transition:all .2s ease-out;-webkit-tap-highlight-color:transparent;}.gui-settings-content ul li.category.folded{margin-bottom:-1px;}span.settings-category{opacity:0.8;}.gui-settings-title{flex-grow:1;font-size:16px;margin:16px;}.gui-settings-close{width:24px;height:24px;padding:16px;}.gui-settings-header .gui-settings-close{cursor:pointer;-webkit-tap-highlight-color:transparent;}.gui-settings-header .gui-settings-close:hover path{fill:$customStyleColor!important;}.gui-settings-close path{fill:#222;}.gui-settings-ok path{fill:transparent;}.gui-settings-textbox-container{display:flex;justify-content:center;align-items:center;-webkit-tap-highlight-color:transparent;}.gui-settings-textbox-container span,.gui-settings-dropdown-span{margin:0 16px;transition:all 0.2s;}.gui-settings-textbox-container input,.gui-settings-dropdown input{border-radius:4px;border:none;height:100%;max-width:80px;padding:2px 8px;background:#8884;transition:all 0.2s;font-size:16px;}.gui-settings-textbox-container input:disabled,.gui-settings-textbox-container.disabled span,.gui-settings-textbox-container.disabled div{opacity:0.5;}.gui-settings-checkbox-container{cursor:pointer;display:flex;width:100%;justify-content:start;align-items:center;padding:0 16px;-webkit-tap-highlight-color:transparent;}.gui-settings-checkbox-container input{visibility:collapse;transition:all 0.2s;width:0;}.gui-settings-checkbox-container svg{width:24px;height:24px;border-radius:4px;margin-right:16px;transition:all 0.2s;}.gui-settings-checkbox-container svg path{transform:scale(0.8);transform-origin:center;}.gui-settings-checkbox-container input ~ svg{background-color:#8884;}.gui-settings-checkbox-container input:checked ~ svg{background-color:$customStyleColor;}.gui-settings-checkbox-container input:checked ~ svg path{fill:$foreground;}.gui-settings-checkbox-container input:disabled ~ svg,.gui-settings-checkbox-container input:disabled ~ span{opacity:0.5;}button.gui-settings-button{padding:6px 20px;margin:0 4px;max-height:34px;border:none;background:#8884;border-radius:4px;font-size:16px;cursor:pointer;transition:all 0.2s ease-out;font-family:inherit;-webkit-tap-highlight-color:transparent;}button.gui-settings-button:hover{opacity:.9;}button.gui-settings-button:active{opacity:.8;}button.gui-settings-button:focus{outline:none;}button.save{padding:8px 38px;max-height:38px;background:$customStyleColor;color:$foreground;transform-origin:center;}button.save.save-complete{animation:hide-a-moment 3.8s;}@keyframes hide-a-moment{ 0%,100%{transform:scale(1);} 5%,95%{transform:scale(0);}}.gui-settings-footer svg{width:30px;height:30px;margin-left:0;transition:all 0.2s;position:absolute;transform-origin:center;transform:scale(0);}.gui-settings-footer svg.save-complete{animation:show-a-moment 3.8s;}@keyframes show-a-moment{ 0%,5%,95%,100%{transform:scale(0);} 10%,90%{transform:scale(1);}}.gui-settings-footer svg path{fill:$customStyleColor;}.custom-color-preview{width:40px;height:100%;border-radius:4px;background:$customStyleColor;margin-right:16px;border:1px solid #8884;position:relative;cursor:pointer;box-sizing:border-box;}.predefined-colors{transition:all 0.2s;display:flex;opacity:0;background:white;width:168px;height:168px;position:absolute;box-shadow:0px 3px 20px 2px #0004;border-radius:4px;top:32px;left:-64px;transform:scale(0);transform-origin:top;z-index:9;}.predefined-colors.opened{opacity:1;transform:scale(1);}.predefined-colors-grid{display:grid;grid-template-columns:auto auto auto auto;margin:4px;flex-grow:1;}.predefined-colors-grid-block{width:32px;height:32px;border-radius:4px;justify-self:center;align-self:center;cursor:pointer;}input[key]:focus{outline:none;}input[type=text][key]{height:auto;border:none;border-radius:4px;}.gui-settings-label{margin:0 16px;font-size:16px;}.hidden{display:none!important;}@supports (backdrop-filter: blur(24px)) or (-webkit-backdrop-filter: blur(24px)){.gui-settings-box.blur li.category{-webkit-backdrop-filter:blur(24px);backdrop-filter:blur(24px);background:#fffa;}}@supports (backdrop-filter: blur(64px)) or (-webkit-backdrop-filter: blur(64px)){.gui-settings-box.blur{background:transparent;box-shadow:none;}.gui-settings-box.blur .gui-settings-content,.gui-settings-box.blur .gui-settings-header,.gui-settings-box.blur .gui-settings-footer{-webkit-backdrop-filter:blur(64px);backdrop-filter:blur(64px);}.gui-settings-box.blur .gui-settings-content{background:#fffa;}.gui-settings-box.blur .gui-settings-header,.gui-settings-box.blur .gui-settings-footer{background:#fffa;}}.gui-settings-panel.animation{transition:all .2s ease-out;}i.settings-category-arrow{transform-origin:center;transition:all .2s ease-out;transform:translateY(2.828427px) rotate(-135deg);height:100%;display:inline-block;margin-left:12px;}li.category.folded i.settings-category-arrow{transform:translateY(-2.828427px) rotate(45deg);}i.settings-category-arrow::after{content:"";width:8px;height:8px;background-color:transparent;border:2px solid;border-color:black;opacity:.8;display:block;border-left-color:transparent;border-top-color:transparent;border-radius:2.4px;}.gui-settings-dropdown{position:relative;cursor:pointer;display:inline-block;-webkit-tap-highlight-color:transparent;}.gui-settings-dropdown>ul{position:absolute;top:calc(100%);width:100%;cursor:pointer;background:white;transform-origin:top;transform:scaleY(0);transition:all .2s ease-out;display:flex;flex-direction:column;align-items:center;box-shadow:0px 3px 20px 2px #0004;border-radius:4px;}.gui-settings-dropdown ul li{margin:0;padding:8px 0;height:auto;width:100%;justify-content:center;border-radius:4px;}.gui-settings-dropdown ul li:hover{background:rgba(0,0,0,0.16);}.gui-settings-dropdown.opened>ul{transform:scaleY(1);}.gui-settings-dropdown input{cursor:pointer;}.gui-settings-dropdown::after{content:"";border:4px solid black;position:absolute;top:calc(50% - 6px);box-sizing:border-box;right:6px;transform-origin:center;transform:rotate(45deg);border-left-color:transparent;border-top-color:transparent;opacity:.8;}`; offlineData["https://raw.githubusercontent.com/the1812/Bilibili-Evolved/master/min/full-tweets-title.min.css"] = `.dynamic-m .info,.dynamic-m .title{height:auto!important;}.dynamic-m .info a,.dynamic-m .title a,.dynamic-m .title span{white-space:normal!important;}`; offlineData["https://raw.githubusercontent.com/the1812/Bilibili-Evolved/master/min/image-viewer.min.scss"] = `html.image-viewer-opened,body.image-viewer-opened{overflow:hidden!important;}.image-viewer-container{background:rgba(0,0,0,0.85);width:100%;height:100%;position:fixed;top:0;left:0;z-index:100000;display:none;justify-content:center;align-items:center;}.image-viewer-container.opened{display:flex;}.image-viewer{width:90%;height:90%;display:grid;grid-template-columns:auto 48px;grid-template-rows:48px auto 48px;grid-template-areas:"image close" "image ." "image download";grid-column-gap:12px;justify-items:center;justify-content:stretch;align-items:center;align-content:stretch;}.image-viewer .image{grid-area:image;width:auto;height:auto;max-width:100%;max-height:100%;}.image-viewer .close{grid-area:close;}.image-viewer .download{grid-area:download;}.image-viewer-icon{cursor:pointer;width:100%;height:100%;}.image-viewer-icon svg{max-width:48px;max-height:48px;}.image-viewer-icon path{fill:#eee;transition:all 0.2s;transform-origin:center;}.image-viewer-icon:hover path{fill:$customStyleColor;transform:scale(1.2);}`; -offlineData["https://raw.githubusercontent.com/the1812/Bilibili-Evolved/master/min/toast.min.scss"] = `.toast-card-container{position:fixed;left:16px;bottom:16px;display:flex;flex-direction:column;align-items:start;z-index:100001;}.toast-card{background:#222;min-width:240px;max-width:60vw;box-shadow:0 1px 20px 4px rgba(0,0,0,.4);transition:all 0.3s cubic-bezier(0.18,0.89,0.32,1.28);transform:translateY(16px);transform-origin:bottom;opacity:0;overflow:hidden;display:flex;flex-direction:column;border-left-width:4px;border-left-style:solid;}.toast-card.visible{min-height:96px;transform:scale(1) translateY(0);opacity:1;margin-top:16px;}.toast-card-header{display:flex;align-items:center;}.toast-card-title{font-size:18px;color:#fff6;margin:16px;font-weight:bold;flex:1 1 auto;}svg.toast-card-dismiss{height:24px;width:24px;flex:0 0 auto;padding:16px;cursor:pointer;-webkit-tap-highlight-color:transparent;transition:all .2s ease-out;transform-origin:center;}svg.toast-card-dismiss:hover{transform:scale(1.2);}svg.toast-card-dismiss:active{transform:scale(1.1);}svg.toast-card-dismiss path{fill:#fff6;}.toast-card-message{color:#eeed;font-size:14px;margin:16px;margin-top:0;}.toast-card.toast-default{border-left-color:#444;}.toast-card.toast-error{border-left-color:#f44336;}.toast-card.toast-info{border-left-color:#2196F3;}.toast-card.toast-success{border-left-color:#8BC34A;}.toast-card span,.toast-card .link{display:inline-block;padding:4px 6px;margin:0 2px;background-color:rgba(0,0,0,.1);border-radius:4px;text-decoration:none;color:#eeed;transition:all .2s ease-out;}.toast-card .link:hover{background-color:rgba(0,0,0,.2);}.toast-card .link:active{background-color:rgba(0,0,0,.1);}`; +offlineData["https://raw.githubusercontent.com/the1812/Bilibili-Evolved/master/min/toast.min.scss"] = `.toast-card-container{position:fixed;left:16px;bottom:16px;display:flex;flex-direction:column;align-items:start;z-index:100001;}.toast-card{background:#222;min-width:240px;max-width:60vw;box-shadow:0 1px 20px 4px rgba(0,0,0,.4);transition:all 0.3s cubic-bezier(0.18,0.89,0.32,1.28);transform:translateY(16px);transform-origin:bottom;opacity:0;overflow:hidden;display:flex;flex-direction:column;border-left-width:4px;border-left-style:solid;}.toast-card.visible{min-height:96px;transform:scale(1) translateY(0);opacity:1;margin-top:16px;}.toast-card-header{display:flex;align-items:center;}.toast-card-title{font-size:18px;color:#fff6;margin:16px;font-weight:bold;flex:1 1 auto;}svg.toast-card-dismiss{height:24px;width:24px;flex:0 0 auto;padding:16px;cursor:pointer;-webkit-tap-highlight-color:transparent;transition:all .2s ease-out;transform-origin:center;}svg.toast-card-dismiss:hover{transform:scale(1.2);}svg.toast-card-dismiss:active{transform:scale(1.1);}svg.toast-card-dismiss path{fill:#fff6;}.toast-card-message{color:#eeed;font-size:14px;margin:16px;margin-top:0;white-space:pre-wrap;}.toast-card.toast-default{border-left-color:#444;}.toast-card.toast-error{border-left-color:#f44336;}.toast-card.toast-info{border-left-color:#2196F3;}.toast-card.toast-success{border-left-color:#8BC34A;}.toast-card span,.toast-card .link{display:inline-block;padding:4px 6px;margin:0 2px;background-color:rgba(0,0,0,.1);border-radius:4px;text-decoration:none;color:#eeed;transition:all .2s ease-out;}.toast-card .link:hover{background-color:rgba(0,0,0,.2);}.toast-card .link:active{background-color:rgba(0,0,0,.1);}`; offlineData["https://raw.githubusercontent.com/the1812/Bilibili-Evolved/master/min/blur-video-control.min.css"] = `@supports (backdrop-filter: blur(48px)) or (-webkit-backdrop-filter: blur(48px)){.video-control-blur-layer{width:100%;height:100%;position:absolute;-webkit-backdrop-filter:blur(48px);backdrop-filter:blur(48px);z-index:-1;top:0;}.bilibili-player-video-control-mask{background:transparent!important;}.bilibili-player-video-control-bottom,.bui-slider .bui-track.bui-track-video-progress .bui-bar-wrap{background-color:transparent!important;}.bilibili-player-area .bilibili-player-video-control-wrap,.bilibili-player-area .bilibili-player-video-control-bottom{transition:none!important;}}`; offlineData["https://raw.githubusercontent.com/the1812/Bilibili-Evolved/master/min/force-wide.min.scss"] = `@media screen and (min-width: $forceWideMinWidth){.bili-wrapper{width:1160px;}.bili-wrapper .l-con{width:900px;}.bili-header-m .bili-wrapper{width:1160px;}.bili-header-m .bili-wrapper .l-con{width:900px;}.gg-floor-module{width:1160px;max-height:96px;}.bangumi-timing-module .headline .bili-tab{width:650px;}.bangumi-timing-module .headline .bili-tab .bili-tab-item{width:70px;}.bangumi-timing-module .card-timing:first-child:nth-child(4),.bangumi-timing-module .card-timing:nth-child(2):nth-child(4),.bangumi-timing-module .card-timing:nth-child(3):nth-child(4),.bangumi-timing-module .card-timing:nth-child(4):nth-child(4){padding-top:0;}.bangumi-timing-module .card-timing{padding:36px 34px 0 0;}.audio-list .song-list .song-li:nth-child(5n) .content .text{margin-right:0;}.audiolist-list .song-list .song-li:nth-child(5n) .content .text{margin-right:0;}.elevator-module{margin-left:590px;}#primary_menu,#primary_menu>ul.nav-menu,.uns_box li.u-i.b-post{display:flex;align-items:center;justify-content:space-between;}.primary-menu{width:100%;}.primary-menu .nav-menu{flex-grow:1;}.primary-menu .nav-gif{position:static;margin-left:2%;}.primary-menu .nav-menu>li{margin-right:0!important;}.primary-menu .nav-menu>li.home{padding-right:1%;}}`; offlineData["https://raw.githubusercontent.com/the1812/Bilibili-Evolved/master/min/download-video.min.scss"] = `.download-video-panel.opened{transform:scaleY(1);}.download-video-panel{position:absolute;top:calc(100% + 8px);transition:all .16s ease-out;transform-origin:top;transform:scaleY(0);background:white;border-radius:4px;box-shadow:0px 3px 20px 2px #0004;z-index:100;}.gui-settings-content ol.video-quality li,.video-action>div{cursor:pointer;align-items:center;margin:0;padding:8px 16px;border-radius:4px;transition:all .2s ease-out;}.video-action>div{padding:12px 24px;}.gui-settings-content ol.video-quality li:hover,.video-action>div:hover{background:rgba(0,0,0,0.16);}.video-quality,.video-progress,.video-action,.video-error{display:none;}.download-video-panel.quality:not(.error) .video-quality,.download-video-panel.progress:not(.error) .video-progress,.download-video-panel.action:not(.error) .video-action,.download-video-panel.error .video-error{display:block;}.download-progress-text{display:flex;}.download-progress-title{flex:1 0 0;}.download-progress-background{background-color:#8884;height:4px;width:100%;margin-top:4px;}.download-progress-foreground{background-color:$customStyleColor;transform-origin:left;transition:all .2s ease-out;transform:scaleX(0);height:100%;width:100%;}.download-progress-cancel{margin-top:8px;display:flex;justify-content:center;}.download-progress-cancel>span{border-radius:4px;background-color:#8884;padding:4px 8px;cursor:pointer;}.download-progress-cancel>span:hover{opacity:.9;}.download-progress-cancel>span:active{opacity:.8;}.video-error,.video-progress{padding:12px;}.video-progress{min-width:160px;}#video-complete{display:none;}`; diff --git a/bilibili-evolved.preview.user.js b/bilibili-evolved.preview.user.js index 214178fd8..433dbb3d2 100644 --- a/bilibili-evolved.preview.user.js +++ b/bilibili-evolved.preview.user.js @@ -78,7 +78,7 @@ if (settings.toastInternalError) { Toast.error("stack" in message - ? message.stack.replace(/ at/g, "\n\tat") + ? message.stack : message, "错误"); } console.error(message); diff --git a/bilibili-evolved.user.js b/bilibili-evolved.user.js index 945d84f75..d87b51ac1 100644 --- a/bilibili-evolved.user.js +++ b/bilibili-evolved.user.js @@ -78,7 +78,7 @@ if (settings.toastInternalError) { Toast.error("stack" in message - ? message.stack.replace(/ at/g, "\n\tat") + ? message.stack : message, "错误"); } console.error(message); diff --git a/min/toast.min.scss b/min/toast.min.scss index 9d94a1951..fca1d3c6a 100644 --- a/min/toast.min.scss +++ b/min/toast.min.scss @@ -1 +1 @@ -.toast-card-container{position:fixed;left:16px;bottom:16px;display:flex;flex-direction:column;align-items:start;z-index:100001;}.toast-card{background:#222;min-width:240px;max-width:60vw;box-shadow:0 1px 20px 4px rgba(0,0,0,.4);transition:all 0.3s cubic-bezier(0.18,0.89,0.32,1.28);transform:translateY(16px);transform-origin:bottom;opacity:0;overflow:hidden;display:flex;flex-direction:column;border-left-width:4px;border-left-style:solid;}.toast-card.visible{min-height:96px;transform:scale(1) translateY(0);opacity:1;margin-top:16px;}.toast-card-header{display:flex;align-items:center;}.toast-card-title{font-size:18px;color:#fff6;margin:16px;font-weight:bold;flex:1 1 auto;}svg.toast-card-dismiss{height:24px;width:24px;flex:0 0 auto;padding:16px;cursor:pointer;-webkit-tap-highlight-color:transparent;transition:all .2s ease-out;transform-origin:center;}svg.toast-card-dismiss:hover{transform:scale(1.2);}svg.toast-card-dismiss:active{transform:scale(1.1);}svg.toast-card-dismiss path{fill:#fff6;}.toast-card-message{color:#eeed;font-size:14px;margin:16px;margin-top:0;}.toast-card.toast-default{border-left-color:#444;}.toast-card.toast-error{border-left-color:#f44336;}.toast-card.toast-info{border-left-color:#2196F3;}.toast-card.toast-success{border-left-color:#8BC34A;}.toast-card span,.toast-card .link{display:inline-block;padding:4px 6px;margin:0 2px;background-color:rgba(0,0,0,.1);border-radius:4px;text-decoration:none;color:#eeed;transition:all .2s ease-out;}.toast-card .link:hover{background-color:rgba(0,0,0,.2);}.toast-card .link:active{background-color:rgba(0,0,0,.1);} \ No newline at end of file +.toast-card-container{position:fixed;left:16px;bottom:16px;display:flex;flex-direction:column;align-items:start;z-index:100001;}.toast-card{background:#222;min-width:240px;max-width:60vw;box-shadow:0 1px 20px 4px rgba(0,0,0,.4);transition:all 0.3s cubic-bezier(0.18,0.89,0.32,1.28);transform:translateY(16px);transform-origin:bottom;opacity:0;overflow:hidden;display:flex;flex-direction:column;border-left-width:4px;border-left-style:solid;}.toast-card.visible{min-height:96px;transform:scale(1) translateY(0);opacity:1;margin-top:16px;}.toast-card-header{display:flex;align-items:center;}.toast-card-title{font-size:18px;color:#fff6;margin:16px;font-weight:bold;flex:1 1 auto;}svg.toast-card-dismiss{height:24px;width:24px;flex:0 0 auto;padding:16px;cursor:pointer;-webkit-tap-highlight-color:transparent;transition:all .2s ease-out;transform-origin:center;}svg.toast-card-dismiss:hover{transform:scale(1.2);}svg.toast-card-dismiss:active{transform:scale(1.1);}svg.toast-card-dismiss path{fill:#fff6;}.toast-card-message{color:#eeed;font-size:14px;margin:16px;margin-top:0;white-space:pre-wrap;}.toast-card.toast-default{border-left-color:#444;}.toast-card.toast-error{border-left-color:#f44336;}.toast-card.toast-info{border-left-color:#2196F3;}.toast-card.toast-success{border-left-color:#8BC34A;}.toast-card span,.toast-card .link{display:inline-block;padding:4px 6px;margin:0 2px;background-color:rgba(0,0,0,.1);border-radius:4px;text-decoration:none;color:#eeed;transition:all .2s ease-out;}.toast-card .link:hover{background-color:rgba(0,0,0,.2);}.toast-card .link:active{background-color:rgba(0,0,0,.1);} \ No newline at end of file diff --git a/utils/toast/toast.scss b/utils/toast/toast.scss index 0c79f6641..63de23072 100644 --- a/utils/toast/toast.scss +++ b/utils/toast/toast.scss @@ -67,11 +67,13 @@ svg.toast-card-dismiss path { fill: #fff6; } -.toast-card-message { +.toast-card-message +{ color: #eeed; font-size: 14px; margin: 16px; margin-top: 0; + white-space: pre-wrap; } .toast-card.toast-default {