Merge changes

This commit is contained in:
the1812 2019-09-08 14:00:33 +08:00
commit 199e9f03b4
12 changed files with 42 additions and 27 deletions

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -23,11 +23,11 @@
"custom-navbar.min.html": "72A66BCE1D82163555AFBEAC651A0BB42A661338878C55B9BE8CE3655767A3CC", "custom-navbar.min.html": "72A66BCE1D82163555AFBEAC651A0BB42A661338878C55B9BE8CE3655767A3CC",
"custom-navbar.min.js": "3C02023482679459330A618F0FC7F8B2337C1C20F28B06D5931F87FD24241E3A", "custom-navbar.min.js": "3C02023482679459330A618F0FC7F8B2337C1C20F28B06D5931F87FD24241E3A",
"danmaku-converter.min.js": "E056FD0E80469D3EC4C11BDD78435A1EBFA319DA8DAD9063286E1CA50037EA94", "danmaku-converter.min.js": "E056FD0E80469D3EC4C11BDD78435A1EBFA319DA8DAD9063286E1CA50037EA94",
"dark-important.min.css": "FED04F62558B979ACADEBC3850DF1155CEF55F99AAF6130CB9CFF741DCA16F92", "dark-important.min.css": "7FC057E91B5BE14BF91A549EB33D9828D044546DBC5F47EF8E7829CD64BD5774",
"dark-navbar.min.css": "C02A4001942DE8E26C61520C2499D80512D8CBA0BBA81E7065BA219C4DF9C11D", "dark-navbar.min.css": "C02A4001942DE8E26C61520C2499D80512D8CBA0BBA81E7065BA219C4DF9C11D",
"dark-schedule.min.js": "853C446547603F4F0425F19F09F73335C9EC451A790C1C07E5E5B88A09E9B453", "dark-schedule.min.js": "853C446547603F4F0425F19F09F73335C9EC451A790C1C07E5E5B88A09E9B453",
"dark-styles.min.js": "A6CFEC32B3F78FD2BD5DBB2347A517F9A633802098DF458F70CBE094F9CAD854", "dark-styles.min.js": "A6CFEC32B3F78FD2BD5DBB2347A517F9A633802098DF458F70CBE094F9CAD854",
"dark.min.css": "4B7829EBFE9F33ADA815BE59066CB68A68198FBBAEB4C98583AD7F1B1CC01A7B", "dark.min.css": "E9C88645139D7891E2954AF0D5874079CDF46BB76CA9370E9925AC24FE485A7B",
"debounce.min.js": "54D33E1273C1F3FE19550BF1844339C3D54D6B01DF8A39C3162D95B93B079CFA", "debounce.min.js": "54D33E1273C1F3FE19550BF1844339C3D54D6B01DF8A39C3162D95B93B079CFA",
"default-danmaku-settings.min.css": "D9942B184FEDA7B08CFA0C34920E97D7A83B81762DCBF757642EBB60F95FF25D", "default-danmaku-settings.min.css": "D9942B184FEDA7B08CFA0C34920E97D7A83B81762DCBF757642EBB60F95FF25D",
"default-danmaku-settings.min.js": "30A8D36137B5A4D560BD47F7A264F77C7DD4428291DF3E7EBD8D632B2AE9973E", "default-danmaku-settings.min.js": "30A8D36137B5A4D560BD47F7A264F77C7DD4428291DF3E7EBD8D632B2AE9973E",

Binary file not shown.

File diff suppressed because one or more lines are too long

2
min/dark.min.css vendored

File diff suppressed because one or more lines are too long

View File

@ -105,7 +105,6 @@ blockquote .color-yellow-04,
#app .sticky-bar .bar-content .message, #app .sticky-bar .bar-content .message,
.coupon-content-con .coupon-btn-disable, .coupon-content-con .coupon-btn-disable,
.common .bb-comment .no-login .comment-submit, .common .bb-comment .no-login .comment-submit,
.popup-content-ctnr .bl-button--ghost:hover,
.customize-wrp .select, .customize-wrp .select,
.manga-detail .episode-list-component .episode-list .list-data .list-item.last-read, .manga-detail .episode-list-component .episode-list .list-data .list-item.last-read,
.live-room-app .tabs.isHundred .item.active, .live-room-app .tabs.isHundred .item.active,
@ -114,7 +113,8 @@ blockquote .color-yellow-04,
.live-room-app .guard-rank-cntr.hundred .page-box .live-skin-main-text, .live-room-app .guard-rank-cntr.hundred .page-box .live-skin-main-text,
.live-room-app .guard-rank-cntr.thousand .page-box .live-skin-main-text, .live-room-app .guard-rank-cntr.thousand .page-box .live-skin-main-text,
.live-room-app .guard-rank-cntr.hundred .live-skin-highlight-text, .live-room-app .guard-rank-cntr.hundred .live-skin-highlight-text,
.live-room-app .guard-rank-cntr.thousand .live-skin-highlight-text .live-room-app .guard-rank-cntr.thousand .live-skin-highlight-text,
.popup-content-ctnr .bl-button--ghost
{ {
color: #eee !important; color: #eee !important;
} }
@ -215,8 +215,8 @@ blockquote .color-yellow-04,
.el-date-table td.current:not(.disabled), .el-date-table td.current:not(.disabled),
.el-date-table td.end-date, .el-date-table td.end-date,
.el-date-table td.start-date, .el-date-table td.start-date,
.popup-content-ctnr .bl-button--ghost, .style-section .tag-block .tag-containers .style-tag:active,
.style-section .tag-block .tag-containers .style-tag:active .popup-content-ctnr .bl-button--ghost:hover
{ {
color: var(--foreground-color) !important; color: var(--foreground-color) !important;
} }

View File

@ -2286,7 +2286,6 @@ a.s-btn:hover,
.history-wrap .time-label.active, .history-wrap .time-label.active,
.dynamic-btn.pink, .dynamic-btn.pink,
.sticky-bar .bar-content .send-button, .sticky-bar .bar-content .send-button,
.up-info .up-focus-btn,
.textarea-container .comm-tool .comm-submit, .textarea-container .comm-tool .comm-submit,
.new-notice-bar .message, .new-notice-bar .message,
.card .focus-btn .unfocus .unfocus-text:hover, .card .focus-btn .unfocus .unfocus-text:hover,

View File

@ -1060,7 +1060,6 @@ body>div.to-top.on
.guide .feedback-btn a, .guide .feedback-btn a,
.gift>.expires, .gift>.expires,
.uploader-info .info .follow .btn, .uploader-info .info .follow .btn,
.upload-v2-step1-container .upload-btn,
.error-container .big-btn, .error-container .big-btn,
.infoBarName .inputIng, .infoBarName .inputIng,
.infoBarName .titleName, .infoBarName .titleName,

View File

@ -47,7 +47,9 @@
.container .logout a:hover, .container .logout a:hover,
.container .video-card:hover, .container .video-card:hover,
.container .tab-item--normal:hover, .container .tab-item--normal:hover,
.guest-home .button-box button .guest-home .button-box button,
.video-editor-ol-wrp,
.qa-area-ol-wrp
{ {
background-color: #333 !important; background-color: #333 !important;
} }
@ -180,7 +182,9 @@ li.danmaku-info-row.bpui-selecting,
.mini-header__content .i-frame, .mini-header__content .i-frame,
.round-corner .out-container, .round-corner .out-container,
.round-corner .out-container .tab-bar, .round-corner .out-container .tab-bar,
.container .info .date .container .info .date,
.iframe-comp-container>div,
.edit-article-wrap #edit-article-box
{ {
background-color: transparent !important; background-color: transparent !important;
} }
@ -258,7 +262,9 @@ li.danmaku-info-row.bpui-selecting,
.video-list .card-view .collect-num, .video-list .card-view .collect-num,
.video-list .card-view .danmu-num, .video-list .card-view .danmu-num,
.video-list .card-view .play-num, .video-list .card-view .play-num,
.guest-home .title h2 .guest-home .title h2,
.video-editor-ol-wrp .video-editor-ol-content a,
.qa-area-ol-wrp .qa-area-ol-content a
{ {
color: #aaa !important; color: #aaa !important;
} }
@ -450,7 +456,9 @@ li.danmaku-info-row.bpui-selecting,
.main-panel .title, .main-panel .title,
.main-panel .more, .main-panel .more,
.guest-home .title h1, .guest-home .title h1,
.guest-home .button-box .regist .guest-home .button-box .regist,
.video-editor-ol-wrp .video-editor-ol-content p,
.qa-area-ol-wrp .qa-area-ol-content p
{ {
color: #eee !important; color: #eee !important;
} }
@ -761,7 +769,9 @@ li.danmaku-info-row.bpui-selecting,
.bili-search .user-item .attention-btn:hover, .bili-search .user-item .attention-btn:hover,
.follow-right-module .follow-head .follow-more:hover, .follow-right-module .follow-head .follow-more:hover,
.carousel-wrap .page .next.current, .carousel-wrap .page .next.current,
.guest-home .button-box button:hover .guest-home .button-box button:hover,
.video-editor-ol-wrp .video-editor-ol-btn,
.qa-area-ol-wrp .qa-area-ol-btn
{ {
background-color: var(--theme-color) !important; background-color: var(--theme-color) !important;
} }
@ -868,7 +878,10 @@ li.danmaku-info-row.bpui-selecting,
.video-item-biref:hover .biref-info .biref-title, .video-item-biref:hover .biref-info .biref-title,
.video-list .card-txt:hover, .video-list .card-txt:hover,
.main-panel .more:hover, .main-panel .more:hover,
.international-home .bilibili-search-history .cancel-icon:hover .international-home .bilibili-search-history .cancel-icon:hover,
.up-info .up-focus-btn,
.video-editor-ol-wrp .video-editor-ol-content a:hover,
.qa-area-ol-wrp .qa-area-ol-content a:hover
{ {
color: var(--theme-color) !important; color: var(--theme-color) !important;
} }
@ -906,7 +919,11 @@ li.danmaku-info-row.bpui-selecting,
.timeline-box .timeline-item.new p.num a, .timeline-box .timeline-item.new p.num a,
.new-stat-module .zone-title .headline .new-stat-more:hover, .new-stat-module .zone-title .headline .new-stat-more:hover,
.block-area .timeline-title .headline .timeline-more:hover, .block-area .timeline-title .headline .timeline-more:hover,
.guest-home .button-box button:hover .guest-home .button-box button:hover,
.upload-v2-step1-container #homeDrop .upload-btn .upload-btn-title,
.video-editor-ol-wrp .video-editor-ol-btn,
.qa-area-ol-wrp .qa-area-ol-btn,
.upload-v2-step1-container #homeDrop .upload-btn .upload-btn-title
{ {
color: var(--foreground-color) !important; color: var(--foreground-color) !important;
} }