Remove "overrideNavbar"

This commit is contained in:
the1812 2019-04-28 20:14:52 +08:00
parent 6233fefd99
commit 0178c54eb0
17 changed files with 143 additions and 92 deletions

View File

@ -150,7 +150,7 @@ declare global
useDarkStyle: boolean, useDarkStyle: boolean,
useNewStyle: boolean, useNewStyle: boolean,
compactLayout: boolean, compactLayout: boolean,
showBanner: boolean, hideBanner: boolean,
overrideNavBar: boolean, overrideNavBar: boolean,
expandDanmakuList: boolean, expandDanmakuList: boolean,
expandDescription: boolean, expandDescription: boolean,

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -27,7 +27,8 @@ const settings = {
useDarkStyle: false, useDarkStyle: false,
useNewStyle: true, useNewStyle: true,
compactLayout: false, compactLayout: false,
showBanner: true, // showBanner: true,
hideBanner: false,
overrideNavBar: true, overrideNavBar: true,
expandDanmakuList: true, expandDanmakuList: true,
expandDescription: true, expandDescription: true,
@ -1279,20 +1280,27 @@ Resource.manifest = {
blurBackgroundOpacity: "顶栏(对横幅)透明度", blurBackgroundOpacity: "顶栏(对横幅)透明度",
}, },
}, },
overrideNavBar: { // overrideNavBar: {
path: "override-navbar.min.js", // path: "override-navbar.min.js",
styles: [ // styles: [
"tweetsStyle", // "tweetsStyle",
"navbarOverrideStyle", // "navbarOverrideStyle",
{ // {
key: "noBannerStyle", // key: "noBannerStyle",
condition: () => !settings.showBanner // condition: () => !settings.showBanner
}, // },
], // ],
// displayNames: {
// overrideNavBar: "搜索栏置顶",
// showBanner: "显示顶部横幅",
// preserveRank: "显示排行榜图标",
// },
// },
hideBanner: {
path: "hide-banner.min.js",
style: true,
displayNames: { displayNames: {
overrideNavBar: "搜索栏置顶", hideBanner: "隐藏顶部横幅",
showBanner: "显示顶部横幅",
preserveRank: "显示排行榜图标",
}, },
}, },
touchNavBar: { touchNavBar: {

View File

@ -27,7 +27,8 @@ const settings = {
useDarkStyle: false, useDarkStyle: false,
useNewStyle: true, useNewStyle: true,
compactLayout: false, compactLayout: false,
showBanner: true, // showBanner: true,
hideBanner: false,
overrideNavBar: true, overrideNavBar: true,
expandDanmakuList: true, expandDanmakuList: true,
expandDescription: true, expandDescription: true,
@ -1279,20 +1280,27 @@ Resource.manifest = {
blurBackgroundOpacity: "顶栏(对横幅)透明度", blurBackgroundOpacity: "顶栏(对横幅)透明度",
}, },
}, },
overrideNavBar: { // overrideNavBar: {
path: "override-navbar.min.js", // path: "override-navbar.min.js",
styles: [ // styles: [
"tweetsStyle", // "tweetsStyle",
"navbarOverrideStyle", // "navbarOverrideStyle",
{ // {
key: "noBannerStyle", // key: "noBannerStyle",
condition: () => !settings.showBanner // condition: () => !settings.showBanner
}, // },
], // ],
// displayNames: {
// overrideNavBar: "搜索栏置顶",
// showBanner: "显示顶部横幅",
// preserveRank: "显示排行榜图标",
// },
// },
hideBanner: {
path: "hide-banner.min.js",
style: true,
displayNames: { displayNames: {
overrideNavBar: "搜索栏置顶", hideBanner: "隐藏顶部横幅",
showBanner: "显示顶部横幅",
preserveRank: "显示排行榜图标",
}, },
}, },
touchNavBar: { touchNavBar: {

View File

@ -134,20 +134,27 @@ Resource.manifest = {
blurBackgroundOpacity: "顶栏(对横幅)透明度", blurBackgroundOpacity: "顶栏(对横幅)透明度",
}, },
}, },
overrideNavBar: { // overrideNavBar: {
path: "override-navbar.min.js", // path: "override-navbar.min.js",
styles: [ // styles: [
"tweetsStyle", // "tweetsStyle",
"navbarOverrideStyle", // "navbarOverrideStyle",
{ // {
key: "noBannerStyle", // key: "noBannerStyle",
condition: () => !settings.showBanner // condition: () => !settings.showBanner
}, // },
], // ],
// displayNames: {
// overrideNavBar: "搜索栏置顶",
// showBanner: "显示顶部横幅",
// preserveRank: "显示排行榜图标",
// },
// },
hideBanner: {
path: "hide-banner.min.js",
style: true,
displayNames: { displayNames: {
overrideNavBar: "搜索栏置顶", hideBanner: "隐藏顶部横幅",
showBanner: "显示顶部横幅",
preserveRank: "显示排行榜图标",
}, },
}, },
touchNavBar: { touchNavBar: {

View File

@ -2,7 +2,8 @@ export const settings = {
useDarkStyle: false, useDarkStyle: false,
useNewStyle: true, useNewStyle: true,
compactLayout: false, compactLayout: false,
showBanner: true, // showBanner: true,
hideBanner: false,
overrideNavBar: true, overrideNavBar: true,
expandDanmakuList: true, expandDanmakuList: true,
expandDescription: true, expandDescription: true,

File diff suppressed because one or more lines are too long

View File

@ -1 +1 @@
(()=>{return(e,l)=>{if(e.useDarkStyle){l.applyStyle("scrollbarStyle");SpinQuery.any(()=>$(".custom-scrollbar"),e=>e.removeClass("custom-scrollbar"));if(!e.useNewStyle&&($("#banner_link").length===0||$("#banner_link").length>0&&e.overrideNavBar&&!e.showBanner)){l.applyImportantStyle("darkStyleNavBar")}l.applyStyle("darkStyle");l.applyImportantStyle("darkStyleImportant")}else{l.removeStyle("scrollbarStyle");l.removeStyle("darkStyleNavBar");l.removeStyle("darkStyle");l.removeStyle("darkStyleImportant")}}})(); (()=>{return(e,l)=>{if(e.useDarkStyle){l.applyStyle("scrollbarStyle");SpinQuery.any(()=>$(".custom-scrollbar"),e=>e.removeClass("custom-scrollbar"));if(!e.useNewStyle&&($("#banner_link").length===0||$("#banner_link").length>0&&e.overrideNavBar&&e.hideBanner)){l.applyImportantStyle("darkStyleNavBar")}l.applyStyle("darkStyle");l.applyImportantStyle("darkStyleImportant")}else{l.removeStyle("scrollbarStyle");l.removeStyle("darkStyleNavBar");l.removeStyle("darkStyle");l.removeStyle("darkStyleImportant")}}})();

File diff suppressed because one or more lines are too long

1
min/hide-banner.min.css vendored Normal file
View File

@ -0,0 +1 @@
#banner_link,.z-top-container.has-banner>.header{display:none!important}.b-header-mask-wrp .b-header-mask-bg,div.blur-bg{opacity:0!important}

1
min/hide-banner.min.js vendored Normal file
View File

@ -0,0 +1 @@
(()=>{return(e,l)=>{l.applyStyle("hideBannerStyle")}})();

View File

@ -21,6 +21,15 @@ body
--navbar-foreground: #555; --navbar-foreground: #555;
--navbar-background: white; --navbar-background: white;
} }
body.no-banner #banner_link,
body.no-banner .z-top-container.has-banner>.header,
.bili-header-m>#banner_link .search,
li.nav-item[report-id='playpage_dynamic'] iframe,
li.nav-item[report-id='playpage_dynamic'] .i-frame,
.i_menu_login
{
display: none !important;
}
.bili-header-m>.nav-menu, .bili-header-m>.nav-menu,
.z_top .z_top
@ -261,12 +270,6 @@ body
{ {
border-radius: 0 !important; border-radius: 0 !important;
} }
li.nav-item[report-id='playpage_dynamic'] iframe,
li.nav-item[report-id='playpage_dynamic'] .i-frame,
.i_menu_login
{
display: none !important;
}
#upload-button #upload-button
{ {
padding-left: 4px; padding-left: 4px;

View File

@ -8,7 +8,7 @@ if (settings.useDarkStyle)
if (!settings.useNewStyle && ($("#banner_link").length === 0 || if (!settings.useNewStyle && ($("#banner_link").length === 0 ||
$("#banner_link").length > 0 && $("#banner_link").length > 0 &&
settings.overrideNavBar && settings.overrideNavBar &&
!settings.showBanner)) settings.hideBanner))
{ {
resources.applyImportantStyle("darkStyleNavBar"); resources.applyImportantStyle("darkStyleNavBar");
} }

View File

@ -0,0 +1 @@
resources.applyStyle("hideBannerStyle");

View File

@ -61,9 +61,10 @@
<checkbox indent="0" key="compactLayout" dependencies=""></checkbox> <checkbox indent="0" key="compactLayout" dependencies=""></checkbox>
<checkbox indent="0" key="useCommentStyle" dependencies=""></checkbox> <checkbox indent="0" key="useCommentStyle" dependencies=""></checkbox>
<checkbox indent="0" key="simplifyLiveroom" dependencies=""></checkbox> <checkbox indent="0" key="simplifyLiveroom" dependencies=""></checkbox>
<checkbox indent="0" key="overrideNavBar" dependencies=""></checkbox> <checkbox indent="0" key="hideBanner" dependencies=""></checkbox>
<checkbox indent="1" key="showBanner" dependencies="overrideNavBar"></checkbox> <!-- <checkbox indent="0" key="overrideNavBar" dependencies=""></checkbox> -->
<checkbox indent="1" key="preserveRank" dependencies="overrideNavBar"></checkbox> <!-- <checkbox indent="0" key="showBanner" dependencies=""></checkbox> -->
<!-- <checkbox indent="1" key="preserveRank" dependencies="overrideNavBar"></checkbox> -->
<checkbox indent="0" key="blurVideoControl" dependencies=""></checkbox> <checkbox indent="0" key="blurVideoControl" dependencies=""></checkbox>
<checkbox indent="0" key="customControlBackground" dependencies=""></checkbox> <checkbox indent="0" key="customControlBackground" dependencies=""></checkbox>
<textbox indent="1" key="customControlBackgroundOpacity" dependencies="customControlBackground"></textbox> <textbox indent="1" key="customControlBackgroundOpacity" dependencies="customControlBackground"></textbox>