Skip to content

feat(Calendar): update today cell style #7381

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
ArgoZhang merged 6 commits into from
Dec 20, 2025
Merged

feat(Calendar): update today cell style #7381

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a5d0c7e
style: 调整选中样式
ArgoZhang Dec 20, 2025
a1a2d71
refactor: 重构代码
ArgoZhang Dec 20, 2025
b728ee9
refactor: 移除过期属性
ArgoZhang Dec 20, 2025
96e7556
style: 更新样式
ArgoZhang Dec 20, 2025
66881aa
refactor: 更新当日样式
ArgoZhang Dec 20, 2025
7d9d34b
refactor: 更新代码
ArgoZhang Dec 20, 2025
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
6 changes: 3 additions & 3 deletions src/BootstrapBlazor/Components/Calendar/Calendar.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@namespace BootstrapBlazor.Components
@namespace BootstrapBlazor.Components
@inherits BootstrapComponentBase

<div @attributes="AdditionalAttributes" class="@ClassString">
Expand Down Expand Up @@ -33,7 +33,7 @@
</div>
</div>
<div class="calendar-body">
<table cellspacing="0" cellpadding="0" class="calendar-table">
<table class="calendar-table">
<thead>
@if (HeaderTemplate != null)
{
Expand Down Expand Up @@ -97,7 +97,7 @@
</div>
</div>
<div class="calendar-body">
<table cellspacing="0" cellpadding="0" class="calendar-table table-week">
<table class="calendar-table table-week">
<thead>
@if (HeaderTemplate != null)
{
Expand Down
22 changes: 4 additions & 18 deletions src/BootstrapBlazor/Components/Calendar/Calendar.razor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Licensed to the .NET Foundation under one or more agreements.
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the Apache 2.0 License
// See the LICENSE file in the project root for more information.
// Maintainer: Argo Zhang(argo@live.ca) Website: https://www.blazor.zone
Expand All @@ -9,7 +9,7 @@
namespace BootstrapBlazor.Components;

/// <summary>
///
/// 日历框组件
/// </summary>
public partial class Calendar
{
Expand Down Expand Up @@ -243,14 +243,7 @@ protected async Task OnChangeYear(int offset)
/// <param name="offset"></param>
protected async Task OnChangeMonth(int offset)
{
if (offset == 0)
{
Value = DateTime.Today;
}
else
{
Value = Value.AddMonths(offset);
}
Value = offset == 0 ? DateTime.Today : Value.AddMonths(offset);
if (ValueChanged.HasDelegate)
{
await ValueChanged.InvokeAsync(Value);
Expand All @@ -267,14 +260,7 @@ protected async Task OnChangeMonth(int offset)
/// <param name="offset"></param>
protected async Task OnChangeWeek(int offset)
{
if (offset == 0)
{
Value = DateTime.Today;
}
else
{
Value = Value.AddDays(offset);
}
Value = offset == 0 ? DateTime.Today : Value.AddDays(offset);
WeekNumberText = Localizer[nameof(WeekNumberText), GetWeekCount()];
if (ValueChanged.HasDelegate)
{
Expand Down
27 changes: 26 additions & 1 deletion src/BootstrapBlazor/Components/Calendar/Calendar.razor.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
@use "../../wwwroot/scss/variables" as *;
@use "../../wwwroot/scss/variables" as *;

[data-bs-theme='dark'] .calendar {
--bb-calendar-selected-bg: #{$bb-calendar-selected-bg-dark};
}

.calendar {
--bb-calendar-padding: #{$bb-calendar-padding};
Expand All @@ -21,6 +25,7 @@
--bb-calendar-cell-hover-bg: #{$bb-calendar-cell-hover-bg};
--bb-calendar-header-padding: #{$bb-calendar-header-padding};
--bb-calendar-today-color: #{$bb-calendar-today-color};
--bb-calendar-today-border-color: #{$bb-calendar-today-border-color};
--bb-calendar-selected-color: #{$bb-calendar-selected-color};
--bb-calendar-selected-bg: #{$bb-calendar-selected-bg};
--bb-calendar-week-header-border-bottom: #{$bb-calendar-week-header-border-bottom};
Expand Down Expand Up @@ -111,6 +116,26 @@

&.is-today {
color: var(--bb-calendar-today-color);

span {
position: relative;

&::after {
position: absolute;
width: 2rem;
height: 2rem;
top: -6px;
left: -8px;
border-radius: 50%;
border: 1px solid var(--bb-calendar-today-border-color);
Comment on lines +125 to +130
Copy link

Copilot AI Dec 20, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The border circle uses hardcoded pixel values for positioning (top: -6px, left: -8px) and dimensions (width: 2rem, height: 2rem). This creates a tight coupling between the pseudo-element size and position. Consider using CSS variables or calc() to make the positioning relative to the element's dimensions, or add a comment explaining these magic numbers to improve maintainability.

Copilot uses AI. Check for mistakes.
}
}

&:not(.is-selected) {
span::after {
content: "";
}
}
}

&.is-selected {
Expand Down
8 changes: 5 additions & 3 deletions src/BootstrapBlazor/wwwroot/scss/variables.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// :root
// :root
$bb-primary-color: #409eff;
$bb-primary-color-rgb: 64, 158, 255;
$bb-border-focus-color: #86b7fe;
Expand Down Expand Up @@ -114,8 +114,10 @@ $bb-calendar-cell-height: 85px;
$bb-calendar-cell-hover-bg: rgba(var(--bs-body-color-rgb),.08);
$bb-calendar-header-padding: 12px 0;
$bb-calendar-today-color: #409eff;
$bb-calendar-selected-color: #409eff;
$bb-calendar-selected-bg: rgba(var(--bs-body-color-rgb),.12);
$bb-calendar-selected-color: #fff;
$bb-calendar-selected-bg: #409eff;
$bb-calendar-selected-bg-dark: #15325b;
$bb-calendar-today-border-color: #0078d4;
$bb-calendar-week-header-border-bottom: 2px solid var(--bs-border-color);
$bb-calendar-week-header-min-width: 52px;
$bb-calendar-week-header-padding: 4px;
Expand Down
Loading