Merge changes

This commit is contained in:
the1812 2019-05-25 17:49:31 +08:00
commit 07848b4fa7
12 changed files with 63 additions and 39 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

@ -1,4 +1,4 @@
<fw:AcrylicWindow
<Window
x:Class="VideoLinkDownloader.MainWindow"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@ -7,33 +7,29 @@
xmlns:local="clr-namespace:VideoLinkDownloader"
xmlns:fw="clr-namespace:SourceChord.FluentWPF;assembly=FluentWPF"
mc:Ignorable="d"
TintColor="#0fff"
FallbackColor="#0fff"
Foreground="Black"
NoiseOpacity="0.05"
Background="#222"
Foreground="White"
Title="MainWindow"
ShowTitleBar="False"
Height="450"
Width="800">
<WindowChrome.WindowChrome>
<WindowChrome
GlassFrameThickness="1"
ResizeBorderThickness="4"
CaptionHeight="0"
/>
</WindowChrome.WindowChrome>
<Grid
fw:PointerTracker.Enabled="True"
Background="#0000">
<Grid
x:Name="grid">
<TextBlock
Margin="10"
HorizontalAlignment="Left"
VerticalAlignment="Top"
Text="This is AcrylicWindow"
TextWrapping="Wrap" />
<Button
<Button
x:Name="button"
Content="Button"
HorizontalAlignment="Left"
Margin="5"
Width="75"
Height="32"
Foreground="White"
Style="{StaticResource ButtonRevealStyle}" />
</Grid>
</Grid>
</fw:AcrylicWindow>
</Window>

2
min/dark.min.css vendored

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

2
min/i18n.min.css vendored
View File

@ -1 +1 @@
#page-follows .follow-sidenav .text,.admin-list-cntr .rank-cntr .item .admin-icon,.article-action .ops .coin-btn,.article-action .ops .fav-btn,.article-action .ops .like-btn,.attention-btn-ctnr .left-part,.author-info .communicate-btn,.author-info .favourite-btn,.bb-comment .comment-list .list-item .info .operation .opera-list,.bili-search .nav-wrap .wrap>.sub,.bilibili-player-video-sendbar .bilibili-player-video-danmaku-switch .choose_danmaku,.bilibili-player-video-sendbar .bilibili-player-video-hint,.dashboard li.like,.h .h-f-btn,.history-wrap .history-btn,.info-line .status-no-attend,.live-sidebar-ctnr .sidebar-btn,.media-info .media-right .media-tool-bar .btn-follow,.n .n-data,.player-auxiliary-area .player-auxiliary-setting-menu-wrap,.security-right .mp-mine-takedown,.textarea-container .comm-tool .comm-emoji,.textarea-container .comm-tool .comm-submit,.up-info .up-focus-btn,.user-list .up-item .attention-btn.followed,.user-list .up-item .attention-btn.followed:hover{width:auto!important}#app-ctnr .demo-app .category,.bb-comment .comment-send .comment-emoji{width:max-content!important}.live-panel .more-button,.tag-panel .more-button{width:44px!important}.link-navbar .main-ctnr .nav-logo{width:70px!important}.bili-header-m .profile-m .grade .bar{width:160px!important}.bili-search .contain,.link-navbar .main-ctnr{width:95%!important}.bili-search .video.list{width:calc(100% - 172px)!important}.bili-search .video.list .des{width:100%!important}.gui-settings-box{width:450px!important}#page-follows .follow-sidenav .text{min-width:78px!important}.h .h-f-btn{min-width:76px!important}.primary-menu .nav-menu .nav-name,.primary-menu .nav-menu .side-nav .side-link span{white-space:pre!important}.player-auxiliary-area .player-auxiliary-setting-menu-list{white-space:nowrap!important}.admin-list-cntr .rank-cntr .item .admin-icon,.article-action .ops .coin-btn,.article-action .ops .fav-btn,.article-action .ops .like-btn,.attention-btn-ctnr .left-part,.bb-comment .comment-send .comment-emoji,.bilibili-player-video-sendbar .bilibili-player-video-danmaku-switch .choose_danmaku,.h .h-f-btn,.media-info .media-right .media-tool-bar .btn-follow,.player-auxiliary-area .player-auxiliary-setting-menu-list,.textarea-container .comm-tool .comm-emoji,.textarea-container .comm-tool .comm-submit,.up-info .up-focus-btn{padding:0 8px!important}.n .n-data{padding:10px 8px!important}.user-panel-ctnr .user-panel .content-ctnr .ctrl-btn:nth-child(2n){padding-left:8px!important}.dashboard li.share .text{padding-top:15px!important}.player-auxiliary-area .player-auxiliary-filter-menu{margin:0!important;position:relative!important;left:0!important}.dashboard li.collection{margin:0 10px 0 0!important}.bili-search .rocket-con{margin-left:40%!important}.bili-search .video.matrix:nth-child(5n){margin-right:32px!important}.follow-btn>span>span{margin-left:8px}.dynamic-m .dyn_menu .line,.mode-fullscreen .bilibili-player-video-sendbar .bilibili-player-video-hint,.mode-webfullscreen .bilibili-player-video-sendbar .bilibili-player-video-hint,.nav-wrap .hover-bar,.tab-bar .line{display:none!important}.tab-bar .tab .tab-text.selected{color:var(--theme-color)!important;border-bottom:2px solid!important;box-sizing:border-box!important}.live-panel .more-button{transform:translateX(-9px)!important}.bilibili-player-ending-panel-box-functions .bilibili-player-upinfo-spans>div{align-items:center!important}.dashboard li.collection>div:first-child{display:flex!important;align-items:center!important;flex-direction:column!important}.dashboard li.share{display:inline-flex!important;align-items:center!important;flex-direction:column!important}.user-panel-ctnr .user-panel .content-ctnr .ctrl-btn{float:none!important}#area-list ul li dd{font-size:18px!important}.author-info .communicate-btn,.author-info .communicate-btn:active,.author-info .favourite-btn,.author-info .favourite-btn:active{font-size:12px!important}.dashboard li.like{border-color:transparent!important}.gui-settings-tooltip{left:470px!important}.bb-comment .comment-send .comment-submit,.comment-bilibili-fold .comment-send .comment-submit{overflow-wrap:break-word}html[lang=ja-JP] .player-auxiliary-area .danmaku-info-row-block::after{content:"ブロック"!important}@media screen and (max-width:1400px){.link-navbar .nav-item:not(:first-child) .label{padding:0 12px!important}}
#page-follows .follow-sidenav .text,.admin-list-cntr .rank-cntr .item .admin-icon,.article-action .ops .coin-btn,.article-action .ops .fav-btn,.article-action .ops .like-btn,.attention-btn-ctnr .left-part,.author-info .communicate-btn,.author-info .favourite-btn,.bb-comment .comment-list .list-item .info .operation .opera-list,.bili-search .nav-wrap .wrap>.sub,.bilibili-player-video-sendbar .bilibili-player-video-danmaku-switch .choose_danmaku,.bilibili-player-video-sendbar .bilibili-player-video-hint,.dashboard li.like,.h .h-f-btn,.history-wrap .history-btn,.info-line .status-no-attend,.live-sidebar-ctnr .sidebar-btn,.media-info .media-right .media-tool-bar .btn-follow,.n .n-data,.player-auxiliary-area .player-auxiliary-setting-menu-wrap,.security-right .mp-mine-takedown,.textarea-container .comm-tool .comm-emoji,.textarea-container .comm-tool .comm-submit,.up-info .up-focus-btn,.user-list .up-item .attention-btn.followed,.user-list .up-item .attention-btn.followed:hover{width:auto!important}#app-ctnr .demo-app .category,.bb-comment .comment-send .comment-emoji{width:max-content!important}.live-panel .more-button,.tag-panel .more-button{width:44px!important}.link-navbar .main-ctnr .nav-logo{width:70px!important}.bili-header-m .profile-m .grade .bar{width:160px!important}.bili-search .contain,.link-navbar .main-ctnr{width:95%!important}.bili-search .video.list{width:calc(100% - 172px)!important}.bili-search .video.list .des{width:100%!important}.gui-settings-box{width:450px!important}#page-follows .follow-sidenav .text{min-width:78px!important}.h .h-f-btn{min-width:76px!important}.primary-menu .nav-menu .nav-name,.primary-menu .nav-menu .side-nav .side-link span{white-space:pre!important}.player-auxiliary-area .player-auxiliary-setting-menu-list{white-space:nowrap!important}.admin-list-cntr .rank-cntr .item .admin-icon,.article-action .ops .coin-btn,.article-action .ops .fav-btn,.article-action .ops .like-btn,.attention-btn-ctnr .left-part,.bb-comment .comment-send .comment-emoji,.bilibili-player-video-sendbar .bilibili-player-video-danmaku-switch .choose_danmaku,.h .h-f-btn,.media-info .media-right .media-tool-bar .btn-follow,.player-auxiliary-area .player-auxiliary-setting-menu-list,.textarea-container .comm-tool .comm-emoji,.textarea-container .comm-tool .comm-submit,.up-info .up-focus-btn{padding:0 8px!important}.n .n-data{padding:10px 8px!important}.user-panel-ctnr .user-panel .content-ctnr .ctrl-btn:nth-child(2n){padding-left:8px!important}.dashboard li.share .text{padding-top:15px!important}.player-auxiliary-area .player-auxiliary-filter-menu{margin:0!important;position:relative!important;left:0!important}.dashboard li.collection{margin:0 10px 0 0!important}.bili-search .rocket-con{margin-left:40%!important}.bili-search .video.matrix:nth-child(5n){margin-right:32px!important}.follow-btn>span>span{margin-left:8px}.dynamic-m .dyn_menu .line,.mode-fullscreen .bilibili-player-video-sendbar .bilibili-player-video-hint,.mode-webfullscreen .bilibili-player-video-sendbar .bilibili-player-video-hint,.nav-wrap .hover-bar,.tab-bar .line{display:none!important}.tab-bar .tab .tab-text.selected{color:var(--theme-color)!important;border-bottom:2px solid!important;box-sizing:border-box!important}.live-panel .more-button{transform:translateX(-9px)!important}.bilibili-player-ending-panel-box-functions .bilibili-player-upinfo-spans>div{align-items:center!important}.dashboard li.collection>div:first-child{display:flex!important;align-items:center!important;flex-direction:column!important}.dashboard li.share{display:inline-flex!important;align-items:center!important;flex-direction:column!important}.user-panel-ctnr .user-panel .content-ctnr .ctrl-btn{float:none!important}#area-list ul li dd{font-size:18px!important}.author-info .communicate-btn,.author-info .communicate-btn:active,.author-info .favourite-btn,.author-info .favourite-btn:active{font-size:12px!important}.dashboard li.like{border-color:transparent!important}.gui-settings-tooltip{left:470px!important}.bb-comment .comment-send .comment-submit,.comment-bilibili-fold .comment-send .comment-submit{overflow-wrap:break-word}.info-section .area-text>a{max-width:50px;overflow:hidden;text-overflow:ellipsis;display:inline-block}html[lang=ja-JP] .player-auxiliary-area .danmaku-info-row-block::after{content:"ブロック"!important}@media screen and (max-width:1400px){.link-navbar .nav-item:not(:first-child) .label{padding:0 12px!important}}

File diff suppressed because one or more lines are too long

View File

@ -139,7 +139,8 @@
.view-later-module .video-box-module,
.view-later-module .up-info-module,
.view-later-module .video-info-module .number .fav i,
.main-ctnr .qualify-drawer .draw-list
.main-ctnr .qualify-drawer .draw-list,
.header-info-ctnr .normal-mode .area-link:active
{
background-color: transparent !important;
}

View File

@ -45,14 +45,14 @@ export const toolTips = new Map([
- ビットアイコンはすべてベクトルアイコンを入れ替えており高解像度の画面はぼやけません
注釈:フォローレベルアイコンはマウスでアバタ上に置くことでポップアップした資料カードに表示することができる.`],
["simplifyLiveroom", `- 「老爷」アイコンを隠す
- 勲章アイコンを隠す
- 肩書きアイコンを隠す
- ファン勲章アイコンを隠す
- 活動肩書きアイコンを隠す
- レベルアイコンを隠す
- 艦長アイコンを隠す
- 全域放送を隠す
- ウェルカムメッセージを隠す (例えばxxx老爷进入直播间)
- 抽選のヒントを隠す (例えば艦長を開通する小飞船を抽選など)
- 配信ルームの特な背景を無効にするダークテーマではデフォルトでは特殊な背景も無効になっています
- 配信ルームの特な背景を無効にするダークテーマではデフォルトでは特殊な背景も無効になっています
各項目は非表示にするかどうかを<span>附加功能</span>.`],
["preserveRank", `控制是否在搜索框左侧显示排行榜图标.`],
["hideBanner", `トップページの横断幕を非表示.`],

View File

@ -45,14 +45,14 @@ export const toolTips = new Map<keyof BilibiliEvolvedSettings, string>([
-
:.`],
["simplifyLiveroom", `- 「老爷」アイコンを隠す
-
-
-
-
-
-
-
- (xxx老爷进入直播间)
- ()
-
-
<span></span>.`],
["preserveRank", `控制是否在搜索框左侧显示排行榜图标.`],
["hideBanner", `トップページの横断幕を非表示.`],

View File

@ -194,6 +194,13 @@
{
overflow-wrap: break-word;
}
.info-section .area-text>a
{
max-width: 50px;
overflow: hidden;
text-overflow: ellipsis;
display: inline-block;
}
html[lang='ja-JP'] .player-auxiliary-area .danmaku-info-row-block::after
{

View File

@ -283,6 +283,7 @@ export const map = new Map([
[`填充其他顶栏`, `他の頂欄を埋める`],
[`紧凑布局`, `コンパクトなレイアウト`],
[`背景模糊`, `背景がぼやける`],
[`模糊层不透明度`, `ぼかしの不透明度`],
[`夜间模式`, `ダークテーマ`],
[`夜间模式计划时段`, `ダークテーマ计画タイム`],
[`起始时间`, `開始時刻`],
@ -290,6 +291,15 @@ export const map = new Map([
[`首页使用紧凑布局`, `トップページにコンパクトなレイアウトを使う`],
[`简化评论区`, `コメントエリアの簡潔化`],
[`简化直播间`, `配信ルームの簡潔化`],
[`老爷图标`, `「老爷」アイコン`],
[`粉丝勋章`, `「ファン勲章」アイコン`],
[`活动头衔`, `「活動肩書き」アイコン`],
[`用户等级`, `「レベル」アイコン`],
[`舰长图标`, `「艦長」アイコン`],
[`全区广播`, `全域放送`],
[`欢迎信息`, `ウェルカムメッセージ`],
[`抽奖提示`, `抽選のヒント`],
[`房间皮肤`, `特殊な背景`],
[`隐藏顶部横幅`, `トップの横断幕を非表示`],
[`播放器投影`, `プレーヤー投影`],
[`强制保留弹幕栏`, `弾幕欄を強制保留する`],
@ -348,6 +358,7 @@ export const map = new Map([
[`更换勋章`, `勲章を入れ換える`],
[`更换头衔`, `肩書きを入れ換える`],
[`关于`, `About`],
[`加载中...`, `ローディング中`],
[`动画`, {
selector: `.elevator-module .nav-list .item`,
not,
@ -444,6 +455,7 @@ export const map = new Map([
[`已关注`, `フォロー中`],
[`七日榜`, `週間rank`],
[`舰队`, `艦隊`],
[`粉丝榜`, `ファンrank`],
[`房管`, `管理者`],
[`分享`, `共有`],
[`轮播`, `再放送`],
@ -497,7 +509,7 @@ export const map = new Map([
[`个人信息举报`, `通報する`],
[`观众分析`, `視聴者分析`],
[`游客分析`, `ゲスト分析`],
[`粉丝分析`, `ォロワー分析`],
[`粉丝分析`, `ァン分析`],
[`游客基本属性`, `ゲスト基本属性`],
[`性别占比`, `性別割合`],
[`观众年龄`, `年齢割合`],
@ -515,6 +527,14 @@ export const map = new Map([
selector: `.gui-settings-widgets-box .widgets-container .empty-tip`,
text: `何もないよ = ̄ω ̄=`,
},
{
selector: `.custom-navbar-settings .paddings-desc`,
text: `エッジの間隔:両側のエッジの間隔をパーセントで設定します.100%は頂欄全体の幅です.許容設定範囲は0〜40です.`,
},
{
selector: `.custom-navbar-settings .orders-desc`,
text: `順序と表示:左側の棒状アイコン上でドラッグすると順序が変更されるか、名前を押しながらドラッグすることで順序を変更することができます。右側の目のアイコンをクリックすると表示され、非表示になります.`,
},
/* CSS translation here */
]],