Merge style changes

This commit is contained in:
the1812 2018-12-08 01:07:27 +08:00
commit 34c6057932
14 changed files with 51 additions and 26 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

@ -446,6 +446,7 @@
},
customControlBackgroundStyle: {
path: "min/custom-control-background.min.scss",
order: 11
},
customControlBackground: {
path: "min/custom-control-background.min.js",

View File

@ -446,6 +446,7 @@
},
customControlBackgroundStyle: {
path: "min/custom-control-background.min.scss",
order: 11
},
customControlBackground: {
path: "min/custom-control-background.min.js",

View File

@ -1 +1 @@
@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;}}
@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-video-control-bottom{position:relative;}.bilibili-player-area .bilibili-player-video-control-wrap,.bilibili-player-area .bilibili-player-video-control-bottom{transition:none!important;}}

View File

@ -1 +1 @@
(()=>{return(o,t)=>{if(o.customControlBackgroundOpacity>0){t.applyStyle("customControlBackgroundStyle");if(!o.touchVideoPlayer){t.applyImportantStyleFromText(`\n<style id="control-background-non-touch">\n.bilibili-player-video-control-bottom\n{\n margin: 0 !important;\n padding: 7px 0 0 !important;\n}\n</style>\n `)}}}})();
(()=>{return(o,t)=>{if(o.customControlBackgroundOpacity>0){t.applyStyle("customControlBackgroundStyle");if(!o.touchVideoPlayer){t.applyImportantStyleFromText(`\n<style id="control-background-non-touch">\n.bilibili-player-video-control-bottom\n{\n margin: 7px 0 0 0 !important;\n padding: 8px 0 0 !important;\n}\n</style>\n `)}}}})();

View File

@ -1 +1 @@
.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:rgba(0,0,0,$customControlBackgroundOpacity)!important;}
.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:rgba(0,0,0,$customControlBackgroundOpacity)!important;}

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -335,7 +335,11 @@ body
{
left: -12px !important;
right: -12px !important;
bottom: -6px !important;
bottom: 0px !important;
}
.bilibili-player .bilibili-player-area .bilibili-player-video-control-wrap
{
bottom: 0px !important;
}
.search-bar-ctnr .search-bar input::placeholder,
@ -388,7 +392,7 @@ body
{
left: -12px !important;
right: -12px !important;
bottom: -6px !important;
bottom: 0 !important;
}
.mode-fullscreen .bilibili-player-area.video-control-show:not(.disable-original-hover) .bilibili-player-video-control-top,
.mode-fullscreen .bilibili-player-area.mouse-hover:not(.disable-original-hover) .bilibili-player-video-control-top,
@ -397,6 +401,6 @@ body
{
left: 0 !important;
right: 0 !important;
bottom: 48px !important;
bottom: 42px !important;
}
}

View File

@ -136,13 +136,17 @@
{
left: 0 !important;
right: 0 !important;
bottom: -6px !important;
bottom: 0px !important;
}
.bilibili-player-video-control-top
{
bottom: 0 !important;
}
.disable-original-hover.touch-video-control-show .bilibili-player-video-control-top
{
left: 0 !important;
right: 0 !important;
bottom: 32px !important;
bottom: 38px !important;
}
.bilibili-player-video-control-bottom
{
@ -307,7 +311,7 @@ div.bilibili-player-video-control
{
left: 0 !important;
right: 0 !important;
bottom: -6px !important;
bottom: 0 !important;
}
.player .bilibili-player.mode-fullscreen .disable-original-hover.touch-video-control-show .bilibili-player-video-control-top,
.player .bilibili-player.mode-webfullscreen .disable-original-hover.touch-video-control-show .bilibili-player-video-control-top
@ -316,4 +320,13 @@ div.bilibili-player-video-control
right: 0 !important;
bottom: 48px !important;
}
.mode-fullscreen .bilibili-player-area.video-control-show:not(.disable-original-hover) .bilibili-player-video-control-top,
.mode-fullscreen .bilibili-player-area.mouse-hover:not(.disable-original-hover) .bilibili-player-video-control-top,
.mode-webfullscreen .bilibili-player-area.video-control-show:not(.disable-original-hover) .bilibili-player-video-control-top,
.mode-webfullscreen .bilibili-player-area.mouse-hover:not(.disable-original-hover) .bilibili-player-video-control-top
{
left: 0 !important;
right: 0 !important;
bottom: 48px !important;
}
}

View File

@ -19,6 +19,10 @@
{
background-color: transparent !important;
}
.bilibili-player-video-control-bottom
{
position: relative;
}
.bilibili-player-area .bilibili-player-video-control-wrap,
.bilibili-player-area .bilibili-player-video-control-bottom
{

View File

@ -11,8 +11,8 @@
<style id="control-background-non-touch">
.bilibili-player-video-control-bottom
{
margin: 0 !important;
padding: 7px 0 0 !important;
margin: 7px 0 0 0 !important;
padding: 8px 0 0 !important;
}
</style>
`);

View File

@ -5,5 +5,5 @@
.bilibili-player-video-control-bottom,
.bui-slider .bui-track.bui-track-video-progress .bui-bar-wrap
{
background-color: rgba(0,0,0,$customControlBackgroundOpacity) !important;
background: rgba(0,0,0,$customControlBackgroundOpacity) !important;
}