diff --git a/src/BootstrapBlazor/BootstrapBlazor.csproj b/src/BootstrapBlazor/BootstrapBlazor.csproj index 0e6eb0e364b..1a7f7ef8660 100644 --- a/src/BootstrapBlazor/BootstrapBlazor.csproj +++ b/src/BootstrapBlazor/BootstrapBlazor.csproj @@ -1,7 +1,7 @@  - 9.6.1-beta01 + 9.6.1-beta02 diff --git a/src/BootstrapBlazor/Components/FullScreen/FullScreenButton.razor.cs b/src/BootstrapBlazor/Components/FullScreen/FullScreenButton.razor.cs index 41484efee98..6425e54b2d5 100644 --- a/src/BootstrapBlazor/Components/FullScreen/FullScreenButton.razor.cs +++ b/src/BootstrapBlazor/Components/FullScreen/FullScreenButton.razor.cs @@ -14,7 +14,7 @@ public partial class FullScreenButton /// 获得/设置 退出全屏图标 默认 fa-solid fa-maximize /// [Parameter] - [Obsolete("已启用,请使用 Icon 参数 Please use Icon parameter")] + [Obsolete("已弃用,请使用 Icon 参数;Deprecated. Please use Icon parameter")] [ExcludeFromCodeCoverage] public string? FullScreenIcon { get => FullScreenExitIcon; set => FullScreenExitIcon = value; } diff --git a/src/BootstrapBlazor/Components/FullScreen/FullScreenButton.razor.scss b/src/BootstrapBlazor/Components/FullScreen/FullScreenButton.razor.scss index 3d12b68bd97..db5692c7a8f 100644 --- a/src/BootstrapBlazor/Components/FullScreen/FullScreenButton.razor.scss +++ b/src/BootstrapBlazor/Components/FullScreen/FullScreenButton.razor.scss @@ -1,8 +1,17 @@ -.bb-fs-on, -.bb-fs-open .bb-fs-off { +.bb-fs-on { display: none; } -.bb-fs-open .bb-fs-on { +.bb-fs-off { display: inline-block; } + +:not(:root):fullscreen { + .bb-fs-on { + display: inline-block; + } + + .bb-fs-off { + display: none; + } +} diff --git a/src/BootstrapBlazor/Components/Tab/Tab.razor.scss b/src/BootstrapBlazor/Components/Tab/Tab.razor.scss index 55c3799230f..915da74b3e5 100644 --- a/src/BootstrapBlazor/Components/Tab/Tab.razor.scss +++ b/src/BootstrapBlazor/Components/Tab/Tab.razor.scss @@ -36,11 +36,6 @@ .tabs-body-content { background-color: var(--bs-body-bg); - - &.bb-fs-open { - padding: var(--bb-tabs-body-padding); - overflow: auto; - } } } diff --git a/src/BootstrapBlazor/wwwroot/modules/fullscreen.js b/src/BootstrapBlazor/wwwroot/modules/fullscreen.js index 8775531a88b..addbca44456 100644 --- a/src/BootstrapBlazor/wwwroot/modules/fullscreen.js +++ b/src/BootstrapBlazor/wwwroot/modules/fullscreen.js @@ -25,24 +25,10 @@ export async function toggle(options) { const enterFullscreen = async el => { await el.requestFullscreen(); - - updateFullscreenState(el); } const exitFullscreen = async el => { await document.exitFullscreen() - - updateFullscreenState(el); -} - -const updateFullscreenState = el => { - if (isFullscreen()) { - el.classList.add('bb-fs-open') - } - else { - el.classList.remove('bb-fs-open'); - document.documentElement.classList.remove('bb-fs-open'); - } } const isFullscreen = () => {