Skip to content

doc(Layout): update sass file #2405

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Nov 20, 2023
Merged

doc(Layout): update sass file #2405

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7d1638c
fix: 修复样式丢失问题
ArgoZhang Nov 20, 2023
494d476
doc: 更新示例
ArgoZhang Nov 20, 2023
5c26a3a
chore: bump version 8.0.2
ArgoZhang Nov 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions src/BootstrapBlazor.Server/Components/Samples/LayoutPages.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,7 @@
<Tips class="mt-3">
<p>@Localizer["P1"] <code>Layout</code> @Localizer["P2"] <code>dotnet new bbapp</code> @Localizer["P3"] <code>Visual Studio 2019</code> @Localizer["P4"] <code>@Localizer["P5"]</code> @Localizer["P6"] <a href="template" target="_blank">[@Localizer["P7"]]</a></p>
<div>
<b>@Localizer["P8"]：</b>
<br />
<b class="mb-2">@Localizer["P8"]：</b>
<code>Layout</code> @Localizer["P9"] <code>@Localizer["P10"]</code> @Localizer["P11"] <code>@Localizer["P12"]</code> @Localizer["P13"] <code>AdditionalAssemblies</code> @Localizer["P14"] <a href="https://docs.microsoft.com/en-us/aspnet/core/blazor/fundamentals/routing?view=aspnetcore-3.1#route-to-components-from-multiple-assemblies" target="_blank">[@Localizer["P15"]]</a>
</div>
</Tips>
Expand Down Expand Up @@ -51,7 +50,7 @@
<p>@Localizer["P27"]</p>
<div class="page-layout-demo-option-height">
<span>@Localizer["P28"]</span>
<Slider @bind-Value="@Height" style="margin: 0 1rem;" />
<Slider @bind-Value="@Height" style="margin: 0 1rem; flex: 1;" />
<BootstrapInput Value="@(Height * 100)" readonly style="width: 80px;" />
</div>
</div>
Expand All @@ -61,8 +60,7 @@
<div class="page-layout-demo-option">
<p>@Localizer["P29"]</p>
<div>@Localizer["P30"] <b><TabLink Text="@Localizer["P31"]" Url="layout-page1" Icon="fa-solid fa-font-awesome">@Localizer["P32"]</TabLink></b> @Localizer["P33"]</div>
<br />
<div>@Localizer["P34"] <Button Text="@Localizer["P35"]" Icon="fa-solid fa-font-awesome" OnClickWithoutRender="OnNavigation" /></div>
<div class="mt-2">@Localizer["P34"] <Button Text="@Localizer["P35"]" Icon="fa-solid fa-font-awesome" OnClickWithoutRender="OnNavigation" /></div>
</div>
}
</div>
2 changes: 1 addition & 1 deletion src/BootstrapBlazor/BootstrapBlazor.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Razor">

<PropertyGroup>
<Version>8.0.1</Version>
<Version>8.0.2</Version>
</PropertyGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net5.0'">
Expand Down
34 changes: 17 additions & 17 deletions src/BootstrapBlazor/Components/Layout/Layout.razor.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
.layout {
-bb-layout-header-height: #{$bb-layout-header-height};
-bb-layout-header-backgound: #{$bb-layout-header-backgound};
-bb-layout-headerbar-backgound: #{$bb-layout-headerbar-backgound};
-bb-layout-headerbar-border-color: #{$bb-layout-headerbar-border-color};
-bb-layout-footer-backgound: #{$bb-layout-footer-backgound};
-bb-layout-footer-height: #{$bb-layout-footer-height};
-bb-layout-user-height: #{$bb-layout-user-height};
-bb-layout-sidebar-width: #{$bb-layout-sidebar-width};
-bb-layout-sidebar-collapse-width: #{$bb-layout-sidebar-collapse-width};
-bb-layout-sidebar-banner-background: #{$bb-layout-sidebar-banner-background};
-bb-layout-sidebar-scrollbar-background: #{$bb-layout-sidebar-scrollbar-background};
-bb-layout-sidebar-backgound: #{$bb-layout-sidebar-backgound};
-bb-layout-sidebar-color: #{$bb-layout-sidebar-color};
-bb-layout-title-color: #{$bb-layout-title-color};
-bb-layout-title-margin-left: #{$bb-layout-title-margin-left};
-bb-layout-banner-font-size: #{$bb-layout-banner-font-size};
-bb-layout-banner-logo-width: #{$bb-layout-banner-logo-width};
--bb-layout-header-height: #{$bb-layout-header-height};
--bb-layout-header-backgound: #{$bb-layout-header-backgound};
--bb-layout-headerbar-backgound: #{$bb-layout-headerbar-backgound};
--bb-layout-headerbar-border-color: #{$bb-layout-headerbar-border-color};
--bb-layout-footer-backgound: #{$bb-layout-footer-backgound};
--bb-layout-footer-height: #{$bb-layout-footer-height};
--bb-layout-user-height: #{$bb-layout-user-height};
--bb-layout-sidebar-width: #{$bb-layout-sidebar-width};
--bb-layout-sidebar-collapse-width: #{$bb-layout-sidebar-collapse-width};
--bb-layout-sidebar-banner-background: #{$bb-layout-sidebar-banner-background};
--bb-layout-sidebar-scrollbar-background: #{$bb-layout-sidebar-scrollbar-background};
--bb-layout-sidebar-backgound: #{$bb-layout-sidebar-backgound};
--bb-layout-sidebar-color: #{$bb-layout-sidebar-color};
--bb-layout-title-color: #{$bb-layout-title-color};
--bb-layout-title-margin-left: #{$bb-layout-title-margin-left};
--bb-layout-banner-font-size: #{$bb-layout-banner-font-size};
--bb-layout-banner-logo-width: #{$bb-layout-banner-logo-width};
display: flex;
height: 100%;
width: 100%;
Expand Down